tree 01e9792080c37b4a3d734c1ec80e7232c9ca3f30
parent 23110f2642227bbb536815a3fb2c73d408eb8c67
parent 6ed37105f94d1d3a52f97d17a058afa10573eff8
author Chen Xu <fionaxu@google.com> 1542090738 -0800
committer android-build-merger <android-build-merger@google.com> 1542090738 -0800

Merge "parent carrier id"
am: 6ed37105f9

Change-Id: Ib00662b38b896ce89475f8d0a6f8949eeef37c93