tree 3caec3c27517af0e63e68b8e0dde70a72f848b81
parent 64801670b1213c3b6ac32b9b6d0ff178e1e0f974
parent 0c50371d12cb2d32af18328fd0c9e8db5f4ade87
author Amit Mahajan <amitmahajan@google.com> 1530310023 -0700
committer android-build-merger <android-build-merger@google.com> 1530310023 -0700

[automerger skipped] Merge "Add new carrier config for CDMA registered PLMN when not roaming." am: c8eb9ef591 am: d7a5190868  -s ours
am: 0c50371d12  -s ours

Change-Id: I09a6f75b9884a7c1ecc3a87502f1ace87210df97