summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-10-22 06:18:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 06:18:43 +0000
commitbdc458048abee78a945a26cd13a71245e7d4a2e5 (patch)
treeed8307d9baff85ff504ab69759e46d83b3e3ef8f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec (diff)
parent809dcade9906001f6aa51a68aa783e20bb1d7c0d (diff)
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
am: 809dcade99 * commit '809dcade9906001f6aa51a68aa783e20bb1d7c0d': Reinstate CHANGE_NETWORK_STATE as a normal permission.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions