tree 20433f5877517be193e526bdb06ab96737235587
parent 9c33c707ce1b3844c80db136aed99bc2528f8f5e
parent b05dbe320cc7cecb104c1b7ae38a57d5f3cecc89
author Brian Carlstrom <bdc@google.com> 1474526265 +0000
committer android-build-merger <android-build-merger@google.com> 1474526265 +0000

Fix cast from pointer to integer of different size am: b743e03c9b am: 911f176567 am: 452cd40d64 am: 7f23da12fc
am: b05dbe320c

Change-Id: I80700dff771ba584f83b6625a43318c9fefd57be