summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Expand)AuthorAgeFilesLines
* Merge "adb warns on remount when verity is enabled" into lmp-mr1-devPaul Lawrence2014-10-281-1/+33
|\
| * adb warns on remount when verity is enabledPaul Lawrence2014-10-271-1/+33
* | am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"JP Abgrall2014-10-201-0/+3
|\ \
| * | adb: Add USB vendor ID for TrekStor GmbHThorsten Koroscha2014-10-201-0/+3
* | | resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-105-4/+219
|\ \ \ | | |/ | |/|
| * | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""Paul Lawrence2014-10-095-4/+219
* | | resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-095-219/+4
|\ \ \ | |/ /
| * | Revert "Enable verity on userdebug, and add disable-verity to adb"Nick Kralevich2014-10-085-219/+4
* | | resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-095-4/+220
|\ \ \ | |/ /
| * | Enable verity on userdebug, and add disable-verity to adbPaul Lawrence2014-10-085-4/+219
* | | am a866e5a8: am 6cf1193b: am 2f431a8d: Fix windows-specific error without mes...Stephen Hines2014-10-024-5/+3
|\ \ \ | |/ /
| * | Fix windows-specific error without messing up Makefile flags.Stephen Hines2014-10-014-5/+3
* | | am 541a7804: am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp o...Stephen Hines2014-10-021-1/+4
|\ \ \ | |/ /
| * | Fix build breakage for missing -Wcpp option on old GCC versions.Stephen Hines2014-10-011-1/+4
* | | am 4acabfee: am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for ...Stephen Hines2014-10-024-4/+4
|\ \ \ | |/ /
| * | Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-devStephen Hines2014-10-014-4/+4
| |\ \
| | * | Remove obsolete reference to ddk; Fixes for -WerrorAndrew Hsieh2014-09-304-4/+4
* | | | am 0edbf89e: am c75dac39: Merge "fix for adbd pinning CPU" into lmp-devVince Harron2014-10-011-1/+1
|\ \ \ \ | |/ / /
| * | | fix for adbd pinning CPUVince Harron2014-09-251-1/+1
| |/ /
| * | 74602: Fixes adb not seeing connected devices on Mac.Esteban de la Canal2014-09-151-5/+9
* | | am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding fu...Alex Klyubin2014-09-261-19/+47
|\ \ \ | | |/ | |/|
| * | Merge "Switch from using base64 BIOs to encoding funcs."Alex Klyubin2014-09-261-19/+47
| |\ \
| | * | Switch from using base64 BIOs to encoding funcs.Adam Langley2014-09-051-19/+47
* | | | am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""Dan Albert2014-09-251-4/+21
|\ \ \ \ | |/ / /
| * | | Revert "Switch adb to epoll(2)."Dan Albert2014-09-251-4/+21
* | | | am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."Elliott Hughes2014-09-231-21/+4
|\ \ \ \ | |/ / /
| * | | Switch adb to epoll(2).Elliott Hughes2014-09-231-21/+4
| * | | fix windows buildDoug Zongker2014-09-161-1/+1
| * | | Merge changes I11e84a7b,I5adaedd8Kenny Root2014-09-163-3/+113
| |\ \ \
| | * | | adb: fix 64-bit buildColin Cross2014-09-161-1/+1
| | * | | add sideload-host mode to adbDoug Zongker2014-09-163-3/+113
* | | | | am 99bb69c1: am f41ee3d5: Merge "74602: Fixes adb not seeing connected device...Esteban de la Canal2014-09-121-5/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "74602: Fixes adb not seeing connected devices on Mac."Esteban de la Canal2014-09-121-5/+9
| |\ \ \ \
| | * | | | 74602: Fixes adb not seeing connected devices on Mac.Esteban de la Canal2014-09-111-5/+9
| | |/ / /
* | | | | am 6608a46c: am c4ff0389: Merge "adb: Add USB vendor ID for Alco Digital Devi...Elliott Hughes2014-09-101-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | adb: Add USB vendor ID for Alco Digital Devices LimitedDanielMo2014-09-101-0/+3
| |/ / /
* | | | am 228f8261: Merge "delete_file() should force removal." into lmp-devJeff Sharkey2014-09-091-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | delete_file() should force removal.Jeff Sharkey2014-09-091-1/+1
| * | | Fix build of adb with gcc-4.9.Alexander Ivchenko2014-08-061-2/+5
* | | | am fc8e16bf: am 2c805883: Merge "Add -Wno-deprecated-declarations to makefiles."Christopher Ferris2014-09-061-2/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Add -Wno-deprecated-declarations to makefiles."Christopher Ferris2014-09-061-2/+10
| |\ \ \
| | * | | Add -Wno-deprecated-declarations to makefiles.Christopher Ferris2014-09-041-2/+10
| | | |/ | | |/|
* | | | am 379ca94d: am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST."Chih-Hung Hsieh2014-09-051-2/+5
|\ \ \ \ | |/ / /
| * | | Merge "Include ADB_HOST only code in #if ADB_HOST."Chih-Hung Hsieh2014-09-051-2/+5
| |\ \ \
| | * | | Include ADB_HOST only code in #if ADB_HOST.Chih-Hung Hsieh2014-09-051-2/+5
| | |/ /
* | | | am 0dcc3f65: am 9c814648: Merge "Add USB Vendor ID for Micromax Informatics L...Elliott Hughes2014-09-051-0/+3
|\ \ \ \ | |/ / /
| * | | Add USB Vendor ID for Micromax Informatics Ltd.Abhishek Karmakar2014-09-051-0/+3
| |/ /
* | | am 87ad7cdc: am e1ba39aa: Merge "Fix 64-bit host build."Ying Wang2014-08-141-1/+2
|\ \ \ | |/ /
| * | Fix 64-bit host build.Ying Wang2014-08-141-1/+2
* | | am 771f6f29: am 29c5a78f: Merge "Fix build of adb with gcc-4.9."Elliott Hughes2014-08-061-2/+5
|\ \ \ | |/ /