tree e1f244159b7be70311d2cbb5b874d8e60efa63ea
parent 87942c9aace72daf1efb7f912c95c98efefb4edc
parent 67cb61ee5a8b8f5c967361430fff250e76c3a1dc
author Nick Kralevich <nnk@google.com> 1387478282 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387478282 -0800

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

* commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc':
  adb: Check sender's socket id when receiving packets.