| commit | 54929f253a8be6c2fb042ff558119df5be1807ed | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:52 2021 +0000 |
| tree | a8c034454e4e3100c9d29ec9ec2740f8c2ec3482 | |
| parent | 88dcc206b340e8eba0cf5d502ceab084ed882961 [diff] | |
| parent | f3e52a1f460b5fe62f6c8d1602587e1b6f64eb28 [diff] |
[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a -s ours am: f3e52a1f46 -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: I8d8de88e8683d7069b5a67effce2467f24fee111