tree 14cc41dd7c4b8e4a4fa1a86afbcfac40acd256f5
parent 3f000e58af4d8da4fd62feab28424a8eac9434ec
parent 7c4b45ec0ede9b485446367ead5c54fac734c26a
author kmccormick <kmccormick@google.com> 1365035375 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365035375 -0700

am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs

* commit '7c4b45ec0ede9b485446367ead5c54fac734c26a':
  Doc update: getString -> getInt