summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2015-09-28 18:28:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-28 18:28:14 +0000
commitb4d41021b41b60ce0b053035105d51f453816b1d (patch)
tree07eb76037bc7c369eb36676c10ea7bfeb68d801f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent337c069ac897db69f239c1927ddaf9225a7a6fef (diff)
parent92b28f37de9956c172f779df4cf540abc5b94deb (diff)
am 92b28f37: resolved conflicts for 4ed21bf0 to stage-aosp-master
* commit '92b28f37de9956c172f779df4cf540abc5b94deb': Allow using the JIT
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions