| commit | 48759dde6089db590103060dc15fb85643b5e998 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 21:50:55 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:50:55 2020 +0000 |
| tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
| parent | c1e6d9f82b81380a6ba6c259325e6f24d95afbe0 [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: 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: I0ea9cba50876ebb4528b0c6db8b1ada3ff77cc8c