am ca267b86: Merge "Fix -Wconversion warnings in rr and sglr."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 21 May 2015 01:29:34 +0000 (01:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 May 2015 01:29:34 +0000 (01:29 +0000)
* commit 'ca267b86c85e8348b2ab201667fb2a6ab396288a':
  Fix -Wconversion warnings in rr and sglr.


Trivial merge