tree 7eab4d47970e361f6b57f9600e0f1224df605fd8
parent b31c361077aae2145360288b258d71bfd40655ee
parent c054d414eeafd5ba226c743626b9a7139bda9425
author Jeff Sharkey <jsharkey@android.com> 1366935271 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366935271 -0700

am c054d414: am 99ba7203: Merge "Avoid leaking Surface native object." into jb-mr2-dev

* commit 'c054d414eeafd5ba226c743626b9a7139bda9425':
  Avoid leaking Surface native object.