summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-09-10 01:14:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-10 01:14:38 +0000
commit107c868f109199f005a7984d43aa1df0cf72debe (patch)
tree314869032d6ddf9e9492a3f1d1d15259b1de8bc1
parentb6380403ea68121becb4adfbb97f940b1b37bccf (diff)
parentfe846d3095f345da70d31d405ea1dc06ff9b0925 (diff)
downloadbase-107c868f109199f005a7984d43aa1df0cf72debe.tar.gz
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778 Change-Id: I553eead2b24367b09f4888ea8a687c48cd2bf9da
0 files changed, 0 insertions, 0 deletions