tree cccadaa320084ca12a51563e35a11c847360c99c
parent 5e5c1df313511565c928e1a68a640b9a50874ad7
parent 911f1765676b0592d36d25f080db93bf0425c89e
author Brian Carlstrom <bdc@google.com> 1474509709 +0000
committer android-build-merger <android-build-merger@google.com> 1474509709 +0000

Fix cast from pointer to integer of different size am: b743e03c9b
am: 911f176567

Change-Id: I80b30347c5aaa56cae29ed0ebc4d7af027856abf