tree cccadaa320084ca12a51563e35a11c847360c99c
parent 264935ecd6677561bf41c5a9848110a70c83202b
parent 5e5c1df313511565c928e1a68a640b9a50874ad7
author Brian Carlstrom <bdc@google.com> 1474512516 +0000
committer android-build-merger <android-build-merger@google.com> 1474512516 +0000

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

Change-Id: I52b9086c09d762e0995b4f3b981e54f2175d673c