diff options
author | Jeremy Joslin <jjoslin@google.com> | 2017-01-20 02:43:52 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-20 02:43:52 +0000 |
commit | 596915de30f53312eb9d3176f6b558943967c9b6 (patch) | |
tree | bb0585227b73866340c24c5ea7d9ebd12074f72a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 86663d3c26f77eb815979ca7d4f2b19bfc1eab04 (diff) | |
parent | 3465cd9e30e132a551ed522e313c8a7aa924dc25 (diff) |
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: b5b00857eb am: 0af25e62c9 am: 5418f151cc
am: 3465cd9e30 -s ours
Change-Id: I29104b3a3747d85f4a3ed52b35c06db8bb4bf8d5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions