diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-04-01 21:37:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-01 21:37:56 +0000 |
| commit | cdb73a2711e1400092c84d1e65c5cc06ef893e3b (patch) | |
| tree | b8b24a52296767f350ccfad476ce7a395ae71e6d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 786f82c2976108e4bd3bec08fc2f9c75131fde59 (diff) | |
| parent | 69e03149ab4a66513ed707b383945083a200375f (diff) | |
Merge changes from topic "am-002ad919bad249f3b11d8215de81b6c6"
* changes:
[automerger skipped] Merge changes from topics "nw-scan-cts", "nw-scan-changes" am: f276a56215 am: 7e3864bc99 am: e53008bed5 -s ours am skip reason: change_id I1f75c9005620b3b0e06f066677cba6190f1d266c with SHA1 9cf3e7ae68 is in history
Allow requestNetworkScan to return sanitized info am: c9d7430685 am: 87217889f1 am: 9e1d425b58
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions