commit | 13a0a39812eec8bb6159bbc0056670e35182c6ee | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 10 03:46:52 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:46:52 2020 +0000 |
tree | 86b1c374aa3b2e2b934269d2eb20650aa459643c | |
parent | fd9c32bbb4e60f3d4b60f39bb3784e785ec3ad67 [diff] | |
parent | 7563c44b42e6ee13b75d63ac34a8a563180cb5f3 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 7d5a330dd3 -s ours am: 7563c44b42 -s ours am skip reason: Change-Id If560b4abba6e77df6c5b46e07c1d3a13ca422196 with SHA-1 d581ed23fe is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1520894 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5eb97b1acfcaf15993bb57175a73173d705f4e7f