| commit | 35a89ec68ac99f4aa90ff55bd0c1d7aff8ed19b9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Sep 15 20:32:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 15 20:32:17 2020 +0000 |
| tree | 590cffe637d7cc5a1ce27ca03167eb7a2ed93736 | |
| parent | ca377eb760f059702e51f630dda571173395cf10 [diff] | |
| parent | 9e6c477df7be600332a7f08167385cc541113ce7 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b15aef3a9d -s ours am: 984aae9ffe -s ours am: 89c3d4ffb0 -s ours am: 9e6c477df7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/12579362 Change-Id: Ic470746d0cb4ae1824a9a8a3c5acd46fb64c3535