OSDN Git Service

am f34525e0: (-s ours) am 8ccad4af: Merge "Prepare for the removal of HAVE_MALLOC_H...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 05:25:18 +0000 (05:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:25:18 +0000 (05:25 +0000)
commitd59d16c56859c252c5277a5fc0e06e22258c5b10
tree13ecc6d882506b61ebbdfbee6981fc123cdd1456
parent9c78800893ffb26f9a5db8448361aae6a3df59f4
parentf34525e03f12f4351ac44d683e1f2a6d90de0f67
am f34525e0: (-s ours) am 8ccad4af: Merge "Prepare for the removal of HAVE_MALLOC_H from AndroidConfig.h."

* commit 'f34525e03f12f4351ac44d683e1f2a6d90de0f67':