tree bd3507657ab3fe1aa2b055b6c526a99def6cb6b3
parent 5c0515552d01214792bbf71f3d34da9936f3c1b5
parent d53c07e1accbac0f667db9be918289eb563a7d47
author Stuart Scott <stuartscott@google.com> 1397689964 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397689964 +0000

am d53c07e1: am aa38de2e: am 3963b99b: am 74f0fdfb: am dc0dfc81: am d46649e6: am 7aea03ae: am 15bdbb70: am 78860c44: Merge "Adds Java scanner and placeholders for Native Scanner and Xml Generators." into jb-dev

* commit 'd53c07e1accbac0f667db9be918289eb563a7d47':
  Adds Java scanner and placeholders for Native Scanner and Xml Generators.