| commit | 9ec0e3057c1234a8eecb3d8d1c4ad599cc88125e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:11 2020 +0000 |
| tree | f603834d4011081d47c34e6324a37ba48c780ebd | |
| parent | ed38a5be6b0be0606fef190c5a6703fde5a9725d [diff] | |
| parent | f9ff290cf0821e52f9ac24617a0dd5a7036aa1ef [diff] |
[automerger skipped] Merge Android R am: ae0e3f4b62 -s ours am: 25b499e59f -s ours am: 869a857e7e -s ours am: f9ff290cf0 -s ours am skip reason: Change-Id Ie10758964e24b04d7c12dbd0c61cc408ece3bad9 with SHA-1 722da03997 is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1422528 Change-Id: Ia2d157fe2d269f831d4630025e17a3966c6a4a87