[automerger skipped] Merge "Add APN type XCAP" am: 126564a371
am: 847b15d671
am: ec0c134145
-s ours
am skip reason: Change-Id I7cb450c91a458d66eec558265a8d9f48792cfa77 with SHA-1 1d3b15cd3e
is in history
Change-Id: Ia19903fbd6a2c757d4cb751f79de59cd7ae07e2c
This commit is contained in:
commit
3f1f99165a