tree 10b9975c9d13ea5c40b89932ea64aba20dfcbff8
parent 723d0f061ae4223951fc5edaaf188798479ae207
parent 753730984391312b04f3840f1111622be6a96923
author Chen Xu <fionaxu@google.com> 1516222144 +0000
committer android-build-merger <android-build-merger@google.com> 1516222144 +0000

Merge "new carrier id APIs" am: 3d23b90874
am: 7537309843

Change-Id: I8b64968ddb59304543eee89eb1e2dcb4d66517e3