diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 02:42:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:42:53 +0000 |
| commit | e8d02eb6f4668a2426ebb8e4dcb86d10009a8678 (patch) | |
| tree | ccb2f50cb5a8f482890f6cdfe83203280a72b9e2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 396c0f12e4b4c5f41e60df74701262b5eddb2677 (diff) | |
| parent | bdbc8801383cb352b16fe3e5d09dd3add1421819 (diff) | |
[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: 107c868f10 -s ours am: ace84bf09f -s ours am: 477dcfec1e -s ours am: bdbc880138 -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: I728c39f0eeac408b88bc16eb225e1a72b4ec1078
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions