tree 624bc1a4b9ae39cd4cebcacfe23b59ea231a8c30
parent dbe60357db3be0fd6268ce777647733c3383aa72
parent 5ea77ae380a7ad9268fdbda1d7d3aa14b5839065
author Glenn Kasten <gkasten@google.com> 1366388635 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366388635 +0000

Merge "Fix error message to match CTS" into jb-mr2-dev