tree c4701c5555195364ff37b4126e56fb391e70a878
parent 9eb509c14ed5f004992722213499086b524e4e81
parent 0ee1e893ac0ebc4b349c52ccefd5830099a0313a
author Chen Xu <fionaxu@google.com> 1545244468 -0800
committer android-build-merger <android-build-merger@google.com> 1545244468 -0800

Merge "add carrierid in subscriptionInfo" am: dcab1747cf
am: 0ee1e893ac

Change-Id: Ic0cbe9fd707d48d62b40ea6a03bcc55cd507ee71