| commit | 7064c3c031df9129d29f04e3ce5b14d62e7fd12e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:15 2020 +0000 |
| tree | 084c086f3b98fa02dc772f8f15fd0ec5a98b88c5 | |
| parent | 5f9d26731509b3cb8e96c8e4ae547628bf5f4fc2 [diff] | |
| parent | 1321acfa06ee57fbdf2f18dc2d1f928647831308 [diff] |
[automerger skipped] Merge "Merge Android R" am: 572909e1cb -s ours am: 0b1c69b181 -s ours am: 1321acfa06 -s ours am skip reason: Change-Id I07ed9f116d13f0e93647749bb64027479ddf7749 with SHA-1 7fd6cc9704 is in history Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1422343 Change-Id: I8f0e7cacfe2aac46e7372de7041675bd2f029819