| commit | f9ff290cf0821e52f9ac24617a0dd5a7036aa1ef | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:40 2020 +0000 |
| tree | f603834d4011081d47c34e6324a37ba48c780ebd | |
| parent | a02d748680acb7e41742e2e784e0374bd19e7ce7 [diff] | |
| parent | 869a857e7e531d70df238490971155e555485408 [diff] |
[automerger skipped] Merge Android R am: ae0e3f4b62 -s ours am: 25b499e59f -s ours am: 869a857e7e -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: I6b41ca1271e1a71aad92c3f1e0703e0ac8992529