tree 6a78513d6a16a595bbd2b9df4c3b25c537190df7
parent 54b3aa93edbc4aeb094c7767e943518d2e4416a8
parent 3621ee6fdbca9ce405b20d4c9b94a7c444d13844
author Elliott Hughes <enh@google.com> 1429317545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429317545 +0000

am 3621ee6f: am 340e62f0: Merge "Fix comment typo."

* commit '3621ee6fdbca9ce405b20d4c9b94a7c444d13844':
  Fix comment typo.