Merge "Reintroduce error suppression in DebugTest expectMessage()."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 6 Mar 2015 18:28:05 +0000 (18:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Mar 2015 18:28:06 +0000 (18:28 +0000)

Trivial merge