tree d42eccb70287a68fd08876aadc71f0dd0c3ccb77
parent 6c0c349f82d0d94eda4b2a6d3b97ec6c24abdccd
parent afc5b22c229b94228aa5ae1ff20117c9c76ba2ad
author Elliott Hughes <enh@google.com> 1418141854 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418141854 +0000

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

* commit 'afc5b22c229b94228aa5ae1ff20117c9c76ba2ad':
  Fix typo.