| commit | ed38a5be6b0be0606fef190c5a6703fde5a9725d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 22:10:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 22:10:07 2020 +0000 |
| tree | f603834d4011081d47c34e6324a37ba48c780ebd | |
| parent | 17b719c889d0c23a5868f810b9ab027d66c6acbd [diff] | |
| parent | a02d748680acb7e41742e2e784e0374bd19e7ce7 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 722da03997 -s ours am: a9915c8a8e -s ours am: a02d748680 -s ours am skip reason: Change-Id I4300dcec5639fbeb8bfc5feddee5c2096baf954c with SHA-1 ff226f8746 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/12470084 Change-Id: I923b027fd2e2420fabfc1a6ba1ef6befdef9f31f