tree 28f97e9d0e8e0e8f211f7c491c3a3470d7a1d4db
parent 00ac55ed8b56721536eedf509ea754f4f3737d98
parent ff9414235a4d9052bd3003464be4649607447c9a
author Scott Main <smain@google.com> 1357352774 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357352774 -0800

am ff941423: am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev

* commit 'ff9414235a4d9052bd3003464be4649607447c9a':
  docs: misc bug fixes. including important versioning fixes for first app class