tree a7caa3ec97f33e27651d133aca03a83951987cfe
parent ba6e54b454cf6269dcacc29bd6ea3a06ff602b2c
parent 8a05d13ef656b0147d85e1826b70a55f6b32e1e3
author Scott Main <smain@google.com> 1357858303 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357858303 -0800

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

* commit '8a05d13ef656b0147d85e1826b70a55f6b32e1e3':
  docs: resolve bugs from external tracker