tree aa5eb31a334808d6c422c6def6956eb821bc3311
parent d1e074a72452c909c7ed2a4baf220d9d2f306b20
parent 396f131de7646faacd74ec3be11c4861bb233872
author Marco Nelissen <marcone@google.com> 1423612488 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423612488 +0000

am 396f131d: Merge "Fix memory leak"

* commit '396f131de7646faacd74ec3be11c4861bb233872':
  Fix memory leak