tree 859a138c2ab6a8581ced53c9b74b802e90941d21
parent 83a31b28e9685183657a846bd49077332b9975df
parent e4f3b9580f88108e448410b5f81651c2dec3df3f
author Pengquan Meng <mpq@google.com> 1535592439 -0700
committer android-build-merger <android-build-merger@google.com> 1535592439 -0700

[automerger skipped] Merge "Add new Telephony API for settings migration" am: adbe45e0ca am: 93518497b1
am: e4f3b9580f  -s ours

Change-Id: Ic341e4c8a1eaee22da51c7344f6ffdacec3ccf46