tree fd9159d72ca1e65d549f52665fae2d35b5aaec15
parent b37b53bf0775cabdfac05dd1d644f85b6f830005
parent 98fdcfa9817bf54a8695c57366f4ff047ceddb85
author Nick Kralevich <nnk@google.com> 1387478445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387478445 +0000

am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."

* commit '98fdcfa9817bf54a8695c57366f4ff047ceddb85':
  adb: Check sender's socket id when receiving packets.