OSDN Git Service

am 8ccad4af: Merge "Prepare for the removal of HAVE_MALLOC_H from AndroidConfig.h."
authorElliott Hughes <enh@google.com>
Wed, 8 Jul 2015 18:00:27 +0000 (18:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 18:00:27 +0000 (18:00 +0000)
* commit '8ccad4af261ebfe705e9ec7f67d72410e6bc092c':
  Prepare for the removal of HAVE_MALLOC_H from AndroidConfig.h.


Trivial merge