| commit | 8ed62b2711964307af902ccdaf42538eea98a056 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Sep 15 20:32:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 15 20:32:15 2020 +0000 |
| tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
| parent | 56d1755fc2aa499b8bd3cf775cad614b829aa087 [diff] | |
| parent | c8808c51162b3e4c5100ae96d3d04160f90f77d2 [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: 48759dde60 -s ours am: c8808c5116 -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: I0acdd53b9dfbd09ea817d9fe7b5572361189ad25