diff options
author | Jeremy Joslin <jjoslin@google.com> | 2017-01-09 21:26:24 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-09 21:26:24 +0000 |
commit | ad5277d7936cab691adee87dfc4d656ba73976fd (patch) | |
tree | a57f80cf695afe9663a10aa5d4f2359eb6efe1bd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b9df075a41bfb71b2f10720d20c7caaa072a1ddd (diff) | |
parent | 6cf53d0ab86c69fbf35fd20675028cad910a1b7c (diff) |
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: 4c456d7ddf am: 542aad4c75 am: f91d9debef
am: 6cf53d0ab8 -s ours
Change-Id: I7fa56d40aefeeedd17b6071691ebf9b52bf5778b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions