tree 28c5f203a67d6c696b20ab471e5e911de91c8cbe
parent e255d7399f46de4b4e3d94b95b26df3408274394
parent 56cc5ba79bdf75a73281dc73f13169a409d96c28
author Elliott Hughes <enh@google.com> 1398354204 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398354204 +0000

am 56cc5ba7: am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion."

* commit '56cc5ba79bdf75a73281dc73f13169a409d96c28':
  Fix a typo in an assertion.