tree e067b3de0c2def3f11861a8173e178b381038b4e
parent 6c9f7515e0c7d58d461e0fafb5ee20502c60de67
parent 19c04c90478c4c5b8558a9b94713da148b4aa64c
author Glenn Kasten <gkasten@google.com> 1366388797 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366388797 -0700

am 1de65a91: Merge "Fix error message to match CTS" into jb-mr2-dev

* commit '1de65a91b9d174b26b594073eb1ee0dcccb31819':
  Fix error message to match CTS