tree 6a01a2e7915610242fbba55971d8ce1e655c0e7a
parent 0e90bb97cb105a3c0c9e817f61f83f0982c6ce42
parent 4639ae452e7d22343053c5127ecb44ef19b7baf2
author Nick Kralevich <nnk@google.com> 1387479614 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387479614 +0000

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

* commit '4639ae452e7d22343053c5127ecb44ef19b7baf2':
  adb: Check sender's socket id when receiving packets.