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