tree 542af8b487b8f18df38b05e349cbfad3dcaeb239
parent 57c9b95b1f62ceec18c56ac10fb137a96e7a2287
parent 6bfb7b64ba857f78c0a0bcb08591003655df2b7e
author Nick Kralevich <nnk@google.com> 1390861995 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390861995 -0800

am 6bfb7b64: Merge "Fix overflow in adb_client"

* commit '6bfb7b64ba857f78c0a0bcb08591003655df2b7e':
  Fix overflow in adb_client