tree 5843939ddc11042ae3d8519ae2a897e2cbad2087
parent 3972ce8ab3814845209e0c24b6fd2b8fe00c03b6
parent b8c4ae9f806ccff6447c29dd61154a374c5af398
author Tao Bao <tbao@google.com> 1479321155 +0000
committer android-build-merger <android-build-merger@google.com> 1479321155 +0000

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

Change-Id: I14dcce3a6b967fdbe33854f325a89f7a4963a630