tree d6f7f226ca3281235e49a52ac95128419883bd65
parent 9a60460ac0fb9a5ee4628639aac7d8106e368426
parent 7a800e7982ff607aa339f44742de935033f38cfe
author Jeff Sharkey <jsharkey@android.com> 1367300002 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367300002 -0700

am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."

* commit '7a800e7982ff607aa339f44742de935033f38cfe':
  Avoid leaking AssetFileDescriptor.