tree bb4973bf84c7c82f06c314ec0c548179528a8ae4
parent 63d7395ac108d3b908c3f5f2ee50567df21e564a
parent da013597edcc4239ffac3af15990a170e6d2d812
author Glenn Kasten <gkasten@google.com> 1366389008 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366389008 -0700

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

* commit 'da013597edcc4239ffac3af15990a170e6d2d812':
  Fix error message to match CTS