tree c4b16887fbb0d4d7ab319368cac54fca9af2b2e7
parent 8c95a149b516595e22fa7b6479d7bc02750531c2
parent 5dcb75e67b7a3401aa501126bc8401f78c181a68
author Scott Main <smain@google.com> 1387327283 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387327283 +0000

am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs

* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617