Merge "Fix -Wconversion warnings in negative api tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 20:01:15 +0000 (20:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 May 2015 20:01:15 +0000 (20:01 +0000)

Trivial merge