tree 9ed740291ec99ffd321af0d01a87073790a51540
parent 4f8a160ae36229d0661027f10c27fda900605cf6
parent 9107fa5d7ca1b928e10ffc9395b2f2eb38db7a14
author Scott Main <smain@google.com> 1357677936 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357677936 -0800

am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

* commit '9107fa5d7ca1b928e10ffc9395b2f2eb38db7a14':
  docs: resolve bugs from external tracker