tree 068c000383029f112dcd5c978d26a4b1c0e02cfb
parent 53e621f2f326b9d782b17434316c3eb2593e1fe9
parent 50c782190d282b76b7d961cf7f9a9e3f0db735ad
author Marco Nelissen <marcone@google.com> 1355613038 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355613038 -0800

am 50c78219: am 01f42639: Merge "fix typo in docs"

* commit '50c782190d282b76b7d961cf7f9a9e3f0db735ad':
  fix typo in docs