tree 067e5b1c3d4707b11416c50947934b01907e8ea6
parent 71e17f3fe5bae01f44d08e2e6301e4cf3734ca5c
parent f624391a28d00928e6bf40b4c0361782096305e8
author Chen Xu <fionaxu@google.com> 1545082800 -0800
committer android-build-merger <android-build-merger@google.com> 1545082800 -0800

Merge "expose carrier id APIs and clean up" am: a118a4a772
am: f624391a28

Change-Id: I9333b116771096d1551c08a002a1d79b517edb61