tree fe315f9a2f249956dec5e83653e59322453d7a4b
parent 8272c30513d96c6570f62ffbdd6102f45956e5b1
parent 554d902e4bcd06cb6847a2b960b4b074ed863931
author Martijn Coenen <maco@google.com> 1436787644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436787644 +0000

am 554d902e: Merge "Memory leak and NULL pointer check fixes"

* commit '554d902e4bcd06cb6847a2b960b4b074ed863931':
  Memory leak and NULL pointer check fixes