tree 035af05e64aaa03d3a022087c72a3054abc1e7ea
parent 1aeefcd6900d85911028e6d3e344e338e0a05158
parent 520f4f060325496741f600692f3582536fa43a8f
author Elliott Hughes <enh@google.com> 1371502705 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371502705 -0700

am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"

* commit '520f4f060325496741f600692f3582536fa43a8f':
  adb: fix reported transfer size for transfer over 4 GiB