tree 5843939ddc11042ae3d8519ae2a897e2cbad2087
parent 7563bad2ac1c207985ee4c13a78e05c7b1d0846e
parent 0c15140dad24f73226e018d35d405b15b8f5932d
author Tao Bao <tbao@google.com> 1479320716 +0000
committer android-build-merger <android-build-merger@google.com> 1479320716 +0000

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

Change-Id: I916ad0504f5ceacfe4634a3cd518eddb91cebf64