commit | eba575b048b4e14736d3c80566ca57ae5598bf73 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Sep 17 19:12:37 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 17 19:12:37 2020 +0000 |
tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
parent | 404a70f849b057b586b5085dd8cbb825790329de [diff] | |
parent | 3e0fc337a70bf0c5b85739233d55141b25cbd7bf [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: c31e3686fb -s ours am: eec6fe721a -s ours am: 3e0fc337a7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/12578962 Change-Id: Ib2130d8803d3e744a34f4f74a9154b126f85c4a7