commit | cb9cad37be0226be8d924576a1f2a774c52d26af | [log] [tgz] |
---|---|---|
author | Zoey Chen <zoeychen@google.com> | Mon Dec 09 23:40:24 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Mon Dec 09 23:40:24 2019 -0800 |
tree | 839129a2e7aa46ba78391547415f892eeac63134 | |
parent | abcef7d77158f95e8ed619161b95a2f3e805e44a [diff] | |
parent | 998449912dfec1d6721e1b8b99d6491ab1b1c495 [diff] |
[automerger skipped] Merge "[Telephony Mainline] Move carrier id proto to TelephonyProvider" am: 564d6734e5 -s ours am: 97759f7f2a -s ours am: 998449912d -s ours am skip reason: change_id I4f9cf0d7d899fdfe64858d0ca19cbe350516a8fd with SHA1 e9b03419e3 is in history Change-Id: I6c0408b505b3c9cb0d3a728a2668c9b8c1c5766e