summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Expand)AuthorAgeFilesLines
* am 97e1e170: Merge "Disable vendor id filtering for OS X."Elliott Hughes2014-11-211-56/+37
|\
| * Merge "Disable vendor id filtering for OS X."Elliott Hughes2014-11-211-56/+37
| |\
| | * Disable vendor id filtering for OS X.Al Sutton2014-11-211-56/+37
* | | am 0750f786: Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-211-1/+1
|\ \ \ | |/ /
| * | Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-211-1/+1
| |\ \
| | * | Remove explict use of ASCII encodingAl Sutton2014-11-211-1/+1
| | |/
* | | am 01d49e85: Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."Elliott Hughes2014-11-211-0/+3
|\ \ \ | |/ /
| * | Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."Elliott Hughes2014-11-211-0/+3
| |\ \ | | |/ | |/|
| | * adb: Add USB vendor ID for Ubiquiti Networks, Inc.Jeremy Chang2014-11-191-0/+3
* | | am aa3e17e1: Merge "Return path including executable instead of without"Elliott Hughes2014-11-201-5/+5
|\ \ \ | |/ /
| * | Merge "Return path including executable instead of without"Elliott Hughes2014-11-201-5/+5
| |\ \
| | * | Return path including executable instead of withoutAl Sutton2014-11-201-5/+5
* | | | am 51184950: Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
|\ \ \ \ | |/ / /
| * | | Disable vendor id filtering for Linux.Elliott Hughes2014-11-192-20/+4
| |/ /
* | | am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-191-7/+7
|\ \ \ | |/ /
| * | Fix building on modern versions of Xcode and OS X.Al Sutton2014-11-191-7/+7
| |/
* | am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
|\ \ | |/
| * Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
| |\
| | * Revert "adb: Add USB vendor ID for Honeywell"Elliott Hughes2014-11-181-3/+0
* | | am 6a56ad28: Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
|\ \ \ | |/ /
| * | kill HAVE_TERMIO_HYabin Cui2014-11-171-12/+17
* | | Introduce "adb keygen"Nick Kralevich2014-11-173-3/+34
|\ \ \
| * | | Introduce "adb keygen"Nick Kralevich2014-11-143-3/+34
| * | | Fix adb/fastboot windows compilations.Christopher Ferris2014-11-064-2/+10
* | | | am c9582d02: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
|\ \ \ \ | | |/ / | |/| |
| * | | kill HAVE_FORKEXECYabin Cui2014-11-123-20/+18
* | | | Fix adb/fastboot windows compilations.Christopher Ferris2014-11-064-2/+10
* | | | am 26552565: am 452f08a0: Merge "Add razer usb vid for future use with adb"Elliott Hughes2014-11-051-0/+3
|\ \ \ \ | |/ / /
| * | | am 452f08a0: Merge "Add razer usb vid for future use with adb"Elliott Hughes2014-11-051-0/+3
| |\ \ \
| | * | | Add razer usb vid for future use with adbStuart Wells2014-11-031-0/+3
| * | | | am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"JP Abgrall2014-10-201-0/+3
| |\ \ \ \ | | |/ / /
| * | | | am 2f431a8d: Fix windows-specific error without messing up Makefile flags.Stephen Hines2014-10-024-5/+3
| |\ \ \ \
| * \ \ \ \ am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.Stephen Hines2014-10-021-1/+4
| |\ \ \ \ \
| * \ \ \ \ \ am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into...Stephen Hines2014-10-014-4/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am c75dac39: Merge "fix for adbd pinning CPU" into lmp-devVince Harron2014-09-301-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding fu...Alex Klyubin2014-09-261-19/+47
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 8e1e5415: am 5b4a1767: Merge "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
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ 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
| | |_|_|_|_|_|/ / | |/| | | | | | |