tree aa22f55d77ffcef26eff03d9a32d9abf08d7fa77
parent 8429f43b5f87c244511e3c76107f830ee16998a3
parent 25505f959cc5faada8f9d2af7784f898439fc264
author Scott Main <smain@google.com> 1357704981 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357704981 -0800

am 25505f95: am cdf5106a: docs: a few doc bugs

* commit '25505f959cc5faada8f9d2af7784f898439fc264':
  docs: a few doc bugs