tree 0a1be934e56560c4585d2606ec53336a6a3793f4
parent ca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef
parent 4556cb9cb8b12574c41b749b20c1c149fed54a37
author Martin Storsjo <martin@martin.st> 1476760330 +0000
committer android-build-merger <android-build-merger@google.com> 1476760330 +0000

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

Change-Id: I4cb4a7dace03c7c09403588da05ea8df0f35077e