| commit | ab01fd49dbea7c33eb546fda2719fb811dbff68f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:02:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:02:00 2020 +0000 |
| tree | 19eb641da36d2f8fa37a49ffe2877ad2e4addbf6 | |
| parent | f03464acb1dea7528cfa4f568c9b5013792cf08f [diff] | |
| parent | 34dc83d318d564a8b7e39f8f151685a54f2d67d2 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: aadd6bf231 am: 32aa2f2167 -s ours am: 90bf8b15e5 -s ours am: 34dc83d318 -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: Ia8f15ebf15e09ca8148eb5ace30c97fc1cba252e