tree 5c6dee4fa1f9c087105b3ef07b90425502f0bf32
parent efa5b6142082d8c958b09a932fc972261c405912
parent 6da3cc59a0e77e723a8413d2443b0f1bc5821b03
author Marco Nelissen <marcone@google.com> 1423612857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423612857 +0000

am 6da3cc59: am 396f131d: Merge "Fix memory leak"

* commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03':
  Fix memory leak