diff options
author | Hall Liu <hallliu@google.com> | 2019-04-01 20:31:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-01 20:31:10 +0000 |
commit | f276a56215a643f104a73f29ee704abae916561c (patch) | |
tree | 22baadd19dee0033040f4586254fe9dba292e687 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 1423684d1afbc5bb9b15d270ba5f87f5544d8ac7 (diff) | |
parent | 64fbe76fba23a9f2ef3efced9a3c30993188bad9 (diff) |
Merge changes from topics "nw-scan-cts", "nw-scan-changes"
* changes:
Add shell permissions for CTS testing
Allow requestNetworkScan to return sanitized info
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions