tree 20433f5877517be193e526bdb06ab96737235587
parent 5b1a7d752f37f81ab50040f77b2cc383d1eac387
parent afa9b695983c32c2c3ec65a765747dfb424b8c39
author Brian Carlstrom <bdc@google.com> 1474513967 +0000
committer android-build-merger <android-build-merger@google.com> 1474513967 +0000

Fix cast from pointer to integer of different size am: aeb049f026 am: 5e5c1df313
am: afa9b69598

Change-Id: I7f2b209d92ec0562a1cd57498519d1dbe940873a