commit | 7aea03aeee184acef02e6fb9a6d2e21bb2f1ec74 | [log] [tgz] |
---|---|---|
author | Stuart Scott <stuartscott@google.com> | Wed Apr 16 22:17:58 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 22:17:58 2014 +0000 |
tree | 71852ad575b6313ea508794523e3dc37c07e31ce | |
parent | d69ed9cc2facbda2f13a86ce980666d969284733 [diff] | |
parent | 15bdbb7093144647e67a786207a4742309c6615d [diff] |
am 15bdbb70: am 78860c44: Merge "Adds Java scanner and placeholders for Native Scanner and Xml Generators." into jb-dev * commit '15bdbb7093144647e67a786207a4742309c6615d': Adds Java scanner and placeholders for Native Scanner and Xml Generators.