tree fd00180b9553774f51429cfab49a11740ac6cd5e
parent 92b6011d950a8dee26b43eb107313e98a285009c
parent 0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5
author Elliott Hughes <enh@google.com> 1418162965 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418162965 +0000

am 0aac16bb: am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs

* commit '0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5':
  Fix typo.