tree e745c8cfbf9455a3cc5148f5b280bef4dd758769
parent 4b89a3245d0f33df86a1743d2e692ae2470278a3
parent d50a5e7486432f7554f5135ac0609531d0fa8663
author Elliott Hughes <enh@google.com> 1418168804 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418168804 +0000

am d50a5e74: am afc5b22c: am da30b545: Merge "Fix typo."

* commit 'd50a5e7486432f7554f5135ac0609531d0fa8663':
  Fix typo.