diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:42:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:42:23 +0000 |
| commit | 396c0f12e4b4c5f41e60df74701262b5eddb2677 (patch) | |
| tree | ccb2f50cb5a8f482890f6cdfe83203280a72b9e2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b45984f4dace120a6e2cf251084d77b60b020fc6 (diff) | |
| parent | 1486652e15fbf5c26a6f8d3f3c767b612aa30fe8 (diff) | |
Merge "[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" into rvc-d1-dev-plus-aosp am: 1a4fed1ace -s ours am: 1486652e15 -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: I461a4e16f59a3a399e38ffaed643b4524619c9ad
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions