commit | eec6fe721aadc1f39e5832c16f15e56ecfb93b72 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 14 21:18:53 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:18:53 2020 +0000 |
tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
parent | f30857ae4229c19069ac658b4d51f27f8c2c1359 [diff] | |
parent | c31e3686fb3270d270047e6c82733c5ef0004f08 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: c31e3686fb -s ours am skip reason: Change-Id Icc2368b2b4e4359026f74b9a0bf831868bc37253 with SHA-1 869a857e7e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/12578962 Change-Id: Ib0904bbbd0d3b7888bbddafb149b93e6b657a3cd