tree fe83bafcfcfe0a95bfcc064591740cbcce8d902c
parent a805519ceedc53afa5453a6d8a7d80038d885d9f
parent 02565fec8240bbff105f285e9e25aade52c15450
author The Android Open Source Project <initial-contribution@android.com> 1279646200 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279646200 -0700

am 02565fec: merge from open-source master

Merge commit '02565fec8240bbff105f285e9e25aade52c15450'

* commit '02565fec8240bbff105f285e9e25aade52c15450':
  Fix ADB daemon file descriptor leak