tree cccadaa320084ca12a51563e35a11c847360c99c
parent afa9b695983c32c2c3ec65a765747dfb424b8c39
parent 452cd40d64fa13d3cf2054b8fca96fdf34c57f8e
author Brian Carlstrom <bdc@google.com> 1474512524 +0000
committer android-build-merger <android-build-merger@google.com> 1474512524 +0000

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

Change-Id: I8fcaf53cdd9fcc2fa34b606884ccb78acadda43b