tree 9d6c95968079931ae86a62685826d2ee7daea3c3
parent 3edeb4e97b91810008ca7a733458637f75d1792b
parent 6e40faa241b241f1c32edb40d36f9c407d8f6790
author Elliott Hughes <enh@google.com> 1429987443 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429987443 +0000

am 6e40faa2: am 44984951: am 162e1906: am b271669a: Merge "Fix a trivial comment typo."

* commit '6e40faa241b241f1c32edb40d36f9c407d8f6790':
  Fix a trivial comment typo.