commit | 3e0fc337a70bf0c5b85739233d55141b25cbd7bf | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Sep 17 01:02:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 17 01:02:48 2020 +0000 |
tree | de053563e6f6c29e9e3cce59486c269d125eef6c | |
parent | e440fa432b201e7ba1d5ff515e8477f5ee603c9b [diff] | |
parent | eec6fe721aadc1f39e5832c16f15e56ecfb93b72 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/12578962 Change-Id: I797c31ea4297b46aefd867f5ade97f87b34e58f1