tree 935174efb7ab3e6f273573cf96df95f2f7ebb9dc
parent 74f5930e62f1ee8430b915561dafc5e27eb72440
parent bd1865f659d94a884f0fd05d0b345c2ba5219fc7
author James Dong <jdong@google.com> 1261242017 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261242017 -0800

am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc

Merge commit '4d0e827d0be6085893428b420ec5800f1973a43b' into eclair-mr2-plus-aosp

* commit '4d0e827d0be6085893428b420ec5800f1973a43b':
  Attempt to fix simular build break.