tree 50a236d5ce9f75f28f3c199a8d92f44c18032e93
parent 10d598a2bd1ed7d2a46c06ec5acfab233003634b
parent 6eebd6e6b44d7688489c430cad933e971530e43d
author kmccormick <kmccormick@google.com> 1364593885 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364593885 -0700

am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs

* commit '6eebd6e6b44d7688489c430cad933e971530e43d':
  Doc update: incorrect method name