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:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-22 08:55:10 +0000
commit50e2c2cf360e6cad4aa99efb08a51ff8168ef6b4 (patch)
tree0ad93d87a2e709e9dfd9dc121bebfe377977ee97 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent54255611e417ce5e5292abd6aa192b61c0321ca7 (diff)
parent4b6401f166fb517b51da482ba7be6c1ec1f28668 (diff)
Merge "Block user from setting safe boot setting via adb am: 0ff13fce6f am: 36eb7a1370" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions