tree de555801f15c63400f55fa471053c71618a54562
parent 7ed491262736b96ebe643200cf385e38537ac967
parent 70af3cdb90bafc081ffa693a350b95ced48b6cfd
author Scott Main <smain@google.com> 1357677730 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357677730 -0800

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

* commit '70af3cdb90bafc081ffa693a350b95ced48b6cfd':
  docs: resolve bugs from external tracker