tree fd3323cb60e842c7934796e291f1444009efd241
parent 2ae7857ee5cd4beaaf71cbe1f0b099a2d9192712
parent ea5e2ad900fdaca9937f74d78a8f2cb47f197a4b
author Chen Xu <fionaxu@google.com> 1516222651 +0000
committer android-build-merger <android-build-merger@google.com> 1516222651 +0000

Merge "new carrier id APIs" am: 3d23b90874 am: 7537309843
am: ea5e2ad900  -s ours

Change-Id: I9c157b38bbf8c942bafdb1467d49091a7c3c7264