tree b2248b443e202fedbda7457cfd41fc1deb8c6e82
parent 3ae8b3b030f223d8a72ba976759021fd2a0206ae
parent 2dbc78ee39b0b6385cbecbbce026892d2e280bde
author TreeHugger Robot <treehugger-gerrit@google.com> 1599698816 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599698816 +0000

[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours

am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 c069b066d3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I90bb0d837e4ac6c3acc834653bc1f758d62e1a08