diff options
author | Todd Kennedy <toddke@google.com> | 2015-09-28 18:28:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-28 18:28:14 +0000 |
commit | b4d41021b41b60ce0b053035105d51f453816b1d (patch) | |
tree | 07eb76037bc7c369eb36676c10ea7bfeb68d801f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 337c069ac897db69f239c1927ddaf9225a7a6fef (diff) | |
parent | 92b28f37de9956c172f779df4cf540abc5b94deb (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