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


Trivial merge