tree 7cd7d5a76d6c2f50fddbcdc8711d2d5ba80dd8d8
parent 0dcc3f65b1ff5fa771618436ee4bfdd44cd2f672
parent 299a32c8038d4152b302948e5b961f2fcc04f6b2
author Chih-Hung Hsieh <chh@google.com> 1409960667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409960667 +0000

am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST."

* commit '299a32c8038d4152b302948e5b961f2fcc04f6b2':
  Include ADB_HOST only code in #if ADB_HOST.