tree eb5d494ec839e1897184b075b9a2b383034ee271
parent 4267450e98ae78877cf77a3b28fb4f449b314114
parent 12f100def9e34a554df07f47badc259028ac4c68
author Elliott Hughes <enh@google.com> 1418153426 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418153426 +0000

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

* commit '12f100def9e34a554df07f47badc259028ac4c68':
  Fix typo.