tree b0f8b13dc49d65cfa18d55d536c5f813e40d9df6
parent e3de53725283657ca57bbda6a9a81ef3331de7ba
parent adbe45e0cabf543f55b54214756ac739f21e5cb6
author Pengquan Meng <mpq@google.com> 1535590996 -0700
committer android-build-merger <android-build-merger@google.com> 1535590996 -0700

Merge "Add new Telephony API for settings migration"
am: adbe45e0ca

Change-Id: Ie3b4c9529cc4279f0caf462efaca18d06689f629