tree 9d4820a3e765b60ef9ce75e94cc2c016e00485f8
parent d49f753f0ae6b67566878c74db929c99fe4128e1
parent 03363a273bf594a475696512505ae0229fce59de
author Martijn Coenen <maco@google.com> 1440652006 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652006 +0000

am 03363a27: (-s ours) am 554d902e: Merge "Memory leak and NULL pointer check fixes"

* commit '03363a273bf594a475696512505ae0229fce59de':