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

Trivial merge