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