am c8c64dd0: Merge "Fix -Wconversion warnings in dethread."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 21 May 2015 19:45:03 +0000 (19:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 May 2015 19:45:03 +0000 (19:45 +0000)
* commit 'c8c64dd0853de23061a00b42d709446833c8b73b':
  Fix -Wconversion warnings in dethread.


Trivial merge