tree e1cd14b9f20afdbfb032c37a52f6d199b388076f
parent ec4394bdc371f0cfaa9b11e84d2d15a06e3ef265
parent 6d361878a1a22b4438f39b64fd5b903cf3446b31
author Badhri Jagan Sridharan <badhri@google.com> 1444843975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444843975 +0000

am ba000511: Merge "adbd: Add os descriptor support for adb."

* commit 'ba0005118b78dc8ff456492bb1e16947ab26be9e':
  adbd: Add os descriptor support for adb.