tree ad7d292c885d714e6ccab04321ef06d0e989b771
parent 6f4c0f8e9f07dc67cd72f9613cb6d72b9edb7f86
parent 34acb4c8d4abe1c4f580b85ddc84b18b7e38e417
author Elliott Hughes <enh@google.com> 1415760815 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415760815 +0000

am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder"

* commit '34acb4c8d4abe1c4f580b85ddc84b18b7e38e417':
  Prevent resource leak in YuvToJpegEncoder