am 390e1779: Merge "Fix -Wconversion warnings in fragment output tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:41:27 +0000 (19:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:41:27 +0000 (19:41 +0000)
* commit '390e177927647b0fe01eaf59c0adacde8286af0c':
  Fix -Wconversion warnings in fragment output tests.


Trivial merge