tree 266d3e600d2f914c14a801b12500c418d994c382
parent a18554e6ca9f6fe06b37dec2ddc29e2f44068619
parent fb14e77f45fbad139a0b0c9278bd003964b8f987
author Marco Nelissen <marcone@google.com> 1423615008 +0000
committer android-build-merger <android-build-merger@google.com> 1423615008 +0000

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

* commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987':
  Fix memory leak