tree eef57a2ab17ee31242ae29f0af6a4a3dc4460e33
parent 96f6a1a9e7806b34e7ae8c21b6febf965acf16e1
parent ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0
author David Friedman <dmail@google.com> 1405517317 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405517317 +0000

am ddf853e0: am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged.

* commit 'ddf853e0ce8a32a7d7e7f070b49f44a4edb2fff0':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.