commit | d1a58ba269bfe305c78bc64b407a4ae081f98b34 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Mar 08 00:08:59 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 00:08:59 2022 +0000 |
tree | 001ca3325570e7430db5cfb8b37a85311491155f | |
parent | 226172e88d02bfb923174ab899ba079941c8db1e [diff] | |
parent | 367e2be3c4f026a3737604ce08f57a9fd2c6a334 [diff] |
[automerger skipped] Merge Android 12 am: b03d5e97c5 -s ours am: daf917284a -s ours am: f3e52a1f46 -s ours am: 54929f253a -s ours am: a18d344f48 -s ours am: 367e2be3c4 -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: I3b3636f4d8c10e1e81a58c8f90ce1287665305ba