tree 418724c5b15a81e7dc9d35e8249c1a3cf9966347
parent b32af642454f3113cb1539821eb3b0dbf4174974
parent 2acddc54e1e7a9f41b4b5acc2e8984c46539425a
author Deckard Autoverifier <deckard@android.com> 1311029043 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311029043 -0700

am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free"

* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
  stagefright: Include stdlib.h for malloc/free