tree e031c5cd43bf7ad32ae2a197d51f26810f1c3ba9
parent e3bd2ce3458c56ce48183d094cc41140b286a371
parent 8e3cc4179bc1130cdcb940466602a89ceb9c0327
author Josh Gao <jmgao@google.com> 1452112411 +0000
committer android-build-merger <android-build-merger@google.com> 1452112411 +0000

Merge "Replace MALLOC_IMPL with MALLOC_SVELTE." am: e1f8c66d0b
am: 8e3cc4179b

* commit '8e3cc4179bc1130cdcb940466602a89ceb9c0327':
  Replace MALLOC_IMPL with MALLOC_SVELTE.