OSDN Git Service

am 3290fd46: am 3c7c9a8d: (-s ours) Merge "malloc_usable_size returns the original...
authorChristopher Ferris <cferris@google.com>
Mon, 18 Aug 2014 21:15:06 +0000 (21:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Aug 2014 21:15:06 +0000 (21:15 +0000)
commitc3bc045a5ab6ee9cfd70554c4636515ad962c98f
treec8571ce4bbf42afccff08b6a738594e938f29255
parent754e884618223fa84ce5a2e2f5994d821404cbb0
parent3290fd4625fc67f35b641b52c1142bb64dc25d67
am 3290fd46: am 3c7c9a8d: (-s ours) Merge "malloc_usable_size returns the original size."

* commit '3290fd4625fc67f35b641b52c1142bb64dc25d67':
  malloc_usable_size returns the original size.