tree 5b579ea703f06a809578bec20ac82260ebc36bfd
parent cf11a1601522c669c6df2095d71601546cc7fc7f
parent 585a50cecbccf59666dd65e9fc4320eaa3511634
author Tao Bao <tbao@google.com> 1441734391 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441734391 +0000

am 585a50ce: Merge "imgdiff: fix file descriptor leak"

* commit '585a50cecbccf59666dd65e9fc4320eaa3511634':
  imgdiff: fix file descriptor leak