| commit | 0dcb3529059b6af5cacf30249fd12b41db94538e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Aug 18 00:23:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 00:23:59 2021 +0000 |
| tree | 0e3d372b36f4960d9a26fa32790ab9df8219f22e | |
| parent | 7bb5f1a86fc29e5fbbb1635ac791d3c46fe991e1 [diff] | |
| parent | 0cf229b8c704fd93eb52fb1528acaa01aa295d26 [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e992a3925f -s ours am: ad7187e8e1 -s ours am: 30563abf78 -s ours am: 0cf229b8c7 -s ours am skip reason: Merged-In I10e7e7fc2d7f3d52648a4b46463e1be6c6a6300c with SHA-1 a3d6942d48 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/15571818 Change-Id: I5ba94e358733a22eb428abb5bab32fb5f929ab23