tree 4cc00ec139f75281cc79c8a90cb38652a667ddec
parent 3df87baca9b62acdd425ea2dc8ae390e311ae6a3
parent a3d25d7489d7e071fb6db01b62ec9d925e1d493d
author Marco Nelissen <marcone@google.com> 1426098084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426098084 +0000

am a3d25d74: Merge "Fix context leak"

* commit 'a3d25d7489d7e071fb6db01b62ec9d925e1d493d':
  Fix context leak