| commit | f03464acb1dea7528cfa4f568c9b5013792cf08f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:06 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:06 2020 +0000 |
| tree | 19eb641da36d2f8fa37a49ffe2877ad2e4addbf6 | |
| parent | 938f690b2b9207443c3125ac4dc68c8c6f5c3f93 [diff] | |
| parent | f72157d92dd31d5aa8a997e05be36f5bcb4728a3 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3ccf02284e am: 165b7dc961 -s ours am: 9cc303afd0 -s ours am: f72157d92d -s ours am skip reason: Change-Id I4cd9725b3049dc96a56a723902470fd89501b9f8 with SHA-1 f4a979987e is in history Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1429925 Change-Id: I3745d2c665cc5a8dfde6254f26e16c216801ec9a