diff options
author | Chen Xu <fionaxu@google.com> | 2019-03-05 21:30:19 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-05 21:30:19 -0800 |
commit | ff61f6935ded1fbad84bf2c90dcf8b18a86e57b4 (patch) | |
tree | d2f3bc716d43a265e83e04c3629cf74619405f63 /Android.bp | |
parent | bf5156f219d3665773276e4e3c51494b21c0ed86 (diff) | |
parent | 09a30cba0380106deeafbc78675bf7437cbf133e (diff) | |
download | android_packages_apps_CarrierConfig-ff61f6935ded1fbad84bf2c90dcf8b18a86e57b4.tar.gz android_packages_apps_CarrierConfig-ff61f6935ded1fbad84bf2c90dcf8b18a86e57b4.tar.bz2 android_packages_apps_CarrierConfig-ff61f6935ded1fbad84bf2c90dcf8b18a86e57b4.zip |
[automerger skipped] Merge "migrate cdma home eri from resource overlay to carrierconfig" am: c0e5478aa5 am: a9d3eab855
am: 09a30cba03 -s ours
am skip reason: change_id Id087d06552f336f86ad1ec0f77dabf4120e0a1a4 with SHA1 3178b43af1 is in history
Change-Id: I8f40721b7dcddf8b6b8cf408ee52e95fe89c4eb9
Diffstat (limited to 'Android.bp')
0 files changed, 0 insertions, 0 deletions