commit | e14c9a4617fe664fabf8e8da18835e103e122245 | [log] [tgz] |
---|---|---|
author | Chih-Hung Hsieh <chh@google.com> | Sat Sep 06 00:10:38 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 06 00:10:38 2014 +0000 |
tree | 4b8077955aaf7c2d495b4cc3941ca538395cb157 | |
parent | 317a4df7540a605af738bb98435163a728c2facf [diff] | |
parent | 6d94763b2fd88a66197927d3233eff91e2b8044a [diff] |
am 6d94763b: am 379ca94d: am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST." * commit '6d94763b2fd88a66197927d3233eff91e2b8044a': Include ADB_HOST only code in #if ADB_HOST.