OSDN Git Service

resolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp
authorIliyan Malchev <malchev@google.com>
Sat, 2 Jun 2012 15:14:36 +0000 (08:14 -0700)
committerIliyan Malchev <malchev@google.com>
Sat, 2 Jun 2012 15:14:36 +0000 (08:14 -0700)
commit252a5c854a08e89fc7337ea679220161fe4ea98f
tree8e0e154a5c1c94613138ba8cee0b77b8e34d0a49
parentf0ddaa2fac00ac20059c0b2c142da9de2838a7b6
parente1dd3c287ba836281de0197670018bd9bbfbd62b
resolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp

Change-Id: I58b9c13d20771aa39b703ec05cbff8aeaad38fe8
libc/Android.mk
libc/bionic/malloc_debug_leak.c