tree ee8e5acd4fc0f0f19654d59c2b1a05f1421b221d
parent 49c381af1af3ceb52615416a4a7faede669f0d70
parent 4d9281dae8be449991d19e7408bc2aec10232dac
author Christopher Ferris <cferris@google.com> 1428022903 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428022903 +0000

am 4d9281da: Merge "Update the test for better output on error."

* commit '4d9281dae8be449991d19e7408bc2aec10232dac':
  Update the test for better output on error.