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


Trivial merge