tree e06e5e113fec9dcccf0dfd4dccd1abe23f369713
parent 0ec391d6b759a649b204b6236c01848e3ade912f
parent 9405f9be547e55fa6704660130a0d3489186f91a
author John Grossman <johngro@google.com> 1351617122 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351617122 -0700

am 9405f9be: am 5debe925: Fix a parse error in checkOutputForDevice

* commit '9405f9be547e55fa6704660130a0d3489186f91a':
  Fix a parse error in checkOutputForDevice