OSDN Git Service

am 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has...
authorNick Kralevich <nnk@google.com>
Thu, 9 Apr 2015 00:31:57 +0000 (00:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Apr 2015 00:31:57 +0000 (00:31 +0000)
commitac14f9710b0c6405c19d2eff6f435c51dea1e4f5
tree4b055f6f7ea67fff9a2234906541dca0a36286b4
parent133415d55129b6b29e2bf4454fcbf07c9957f251
parent801411daca44a46338d8fa5e9015b85d94ecb471
am 801411da: am 6d08a0d3: Merge "AndroidConfig.h: ensure HAVE_MALLOC_H always has a value."

* commit '801411daca44a46338d8fa5e9015b85d94ecb471':
  AndroidConfig.h: ensure HAVE_MALLOC_H always has a value.