commit | db2ba9453a9d605b148431500541bd55f87f47df | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 02 01:59:14 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 01:59:14 2020 +0000 |
tree | f511155dd73fd108d6275a842642cb374e160ae5 | |
parent | e4b3229f600582c158d42e72e0eaea525ccfb724 [diff] | |
parent | 2543da10c29cbe04b034107f0e2280a009f47876 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a6fa6c7a79 -s ours am: 4f653d3f0e -s ours am: 6013ddb721 -s ours am: 2543da10c2 -s ours am skip reason: Change-Id I180ec2811830c58219308ec39a7426c2e4062324 with SHA-1 db7f99a8fe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/12484874 Change-Id: Iedfbbe3bc8119b3e9cd6694e5863091ce63859c9