summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-22 08:55:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-22 08:55:29 +0000
commit2b74cb0fca7ba8ed4adc275af40e146280b76baa (patch)
tree0ad93d87a2e709e9dfd9dc121bebfe377977ee97 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent50e2c2cf360e6cad4aa99efb08a51ff8168ef6b4 (diff)
parent23606db8d3438027675704b6626dc29cbc253e87 (diff)
Merge "Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am: f97faada5d am: 6b69f6597e" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions