tree a8c112c6971358abaf92e72fae28cdce9dc3f2f2
parent f37bfb32eb82393d14e339684c9f508cea3b0ab4
parent d372c5c36510b99254b031d3fd5958e246a85544
author Kenny Root <kroot@android.com> 1410889179 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410889179 +0000

am d372c5c3: Merge changes I11e84a7b,I5adaedd8

* commit 'd372c5c36510b99254b031d3fd5958e246a85544':
  adb: fix 64-bit build
  add sideload-host mode to adb