tree 0a1be934e56560c4585d2606ec53336a6a3793f4
parent ca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef
parent 515fb25ef76da9b8a1ad842aaccd3ebb6790c5dc
author Martin Storsjo <martin@martin.st> 1476760720 +0000
committer android-build-merger <android-build-merger@google.com> 1476760720 +0000

Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8
am: 515fb25ef7

Change-Id: Ic97d0e64efee960f87b2cb7581666b2af05873cd