summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2016-07-22 09:01:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-22 09:01:25 +0000
commit5c6d603134c513d576393565e3e39717c5b863bb (patch)
treee66fc52406a522b679d5182c7c6751fe46f0a331 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent370cbc47f3d62f18b3210629ff0d872719b20d9e (diff)
parent23606db8d3438027675704b6626dc29cbc253e87 (diff)
Merge \\\"Block user from setting safe boot setting via adb\\\" into nyc-dev am: f97faada5d am: 6b69f6597e
am: 23606db8d3 Change-Id: Ice507575ac74d6ad14cf397cc73dcf9824097a9f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions