commit | a7d58822e9830ee11db0ab3182fe04fc80aeab66 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 10 01:59:24 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 10 01:59:24 2020 +0000 |
tree | 84ec0e2f07f422708adcc8f552f6feac748c5f1f | |
parent | e18ca30bdadf02912bf15efbc06a5ea7a9c64281 [diff] | |
parent | 81ea02a2a5fa98afa7204ece73fe188e8536fdbe [diff] |
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 7eb675f03d -s ours am: f39a6803e1 -s ours am: 7e3ce21887 -s ours am: 81ea02a2a5 -s ours am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 107ae95001 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778 Change-Id: I235447b402e1c2d2706eeab87e1be4de5bb4db4f