tree efbb7dd6a0f9524388ba03332edf83ed22701435
parent f9d3d2bd59747330acd7ce6acd3a3d895ed9f366
parent 7386c65b1db663be5a3a883826be9d696e3f9937
author Chen Xu <fionaxu@google.com> 1545081661 -0800
committer android-build-merger <android-build-merger@google.com> 1545081661 -0800

Merge "expose carrier id APIs and cleanup"
am: 7386c65b1d

Change-Id: I677bcccfc8c0526bbe32b5968c12dcac052bd61f