tree 6deb0f73301dde2c9db62c6f7d8b4b1a5dedae21
parent cc9e05691de1a8fcfdec8f084d9e10c665875329
parent 120076ea51d8da03e78a2e80988ae74653eb0c3a
author Tao Bao <tbao@google.com> 1479321580 +0000
committer android-build-merger <android-build-merger@google.com> 1479321580 +0000

Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad am: b8c4ae9f80
am: 120076ea51  -s ours

Change-Id: Ie0824192d770e7dbc97e3e6918b2e2a1cb2b5f5e