| commit | 5a202819cf379dc5255d15bbaa73aa6927e4831c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:27:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:27:07 2020 +0000 |
| tree | d7ea370bab0be59a134687a820c3206e44d63170 | |
| parent | 97a9d10038ed0aeb76bfc9a5e41c008403a6f961 [diff] | |
| parent | f03464acb1dea7528cfa4f568c9b5013792cf08f [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: f03464acb1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1429925 Change-Id: I7b678a0547d3d1b4660fda6423526ef1141d7278