tree 20433f5877517be193e526bdb06ab96737235587
parent 0de44d678ee0e50b1e1a4e05ac408622329f1606
parent 7f23da12fcc8eb92a20ed4c2b758447c4fa77efb
author Brian Carlstrom <bdc@google.com> 1474513976 +0000
committer android-build-merger <android-build-merger@google.com> 1474513976 +0000

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

Change-Id: Ida3ef7ccec9e6393a88de8f0dbd58c141c23ce5d