tree 3d0611581a944ab41f4e3b13cec459884dab6d58
parent 7603b7ea17a583f09aba8a24ba8fc913b8b2a3da
parent 33715d1434ec7070afaffed19214e96fd4f1363d
author Joe Malin <jmalin@google.com> 1341353963 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341353963 -0700

am 33715d14: am 4c633ea6: Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev

* commit '33715d1434ec7070afaffed19214e96fd4f1363d':
  DOC CHANGE: AOSP33968 Typo