| commit | f3e52a1f460b5fe62f6c8d1602587e1b6f64eb28 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:36 2021 +0000 |
| tree | a8c034454e4e3100c9d29ec9ec2740f8c2ec3482 | |
| parent | 918c68cf07077c36db8263ef609ff021efd20f9a [diff] | |
| parent | daf917284a48ad1724fa0e00b2e223f6f7273bf9 [diff] |
[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a -s ours am skip reason: Merged-In I3a3a3d1eac33caf0dc0456c294a20da5b4c9951e with SHA-1 c035a4f6c1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1847388 Change-Id: Ib4034ba9ed01729e1b9300999e29f3fd8dbcfb2e