summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of ec9e5891 to masterElliott Hughes2014-01-166-13/+13
|\
| * am 8940c0a0: am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup."Elliott Hughes2014-01-166-13/+13
| |\
| | * am 7cd15614: Merge "system/core 64-bit cleanup."Elliott Hughes2014-01-166-13/+13
| | |\
| | | * system/core 64-bit cleanup.Elliott Hughes2014-01-166-13/+13
* | | | am 42acb531: Merge "Remove obsolete vdc call." into klp-modular-devNick Kralevich2014-01-152-16/+2
|\ \ \ \ | |/ / /
| * | | Remove obsolete vdc call.Nick Kralevich2014-01-142-16/+2
| |/ /
* | | am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"Colin Cross2014-01-121-0/+3
|\ \ \ | |/ /
| * | am e76343ef: Merge "Emerson USB ID"Colin Cross2014-01-111-0/+3
| |\ \ | | |/
| | * Merge "Emerson USB ID"Colin Cross2014-01-121-0/+3
| | |\
| | | * Emerson USB IDJon Sawyer2014-01-111-0/+3
* | | | am 3fb5ebc5: am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"Colin Cross2014-01-091-0/+3
|\ \ \ \ | |/ / /
| * | | am b0751101: Merge "HP USB ID"Colin Cross2014-01-091-0/+3
| |\ \ \ | | |/ /
| | * | HP USB IDJon Sawyer2014-01-081-0/+3
| | |/
* | | am b1b187f7: am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,I...Colin Cross2014-01-061-150/+175
|\ \ \ | |/ /
| * | am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71,...Colin Cross2014-01-061-150/+175
| |\ \ | | |/
| | * adb: Add USB vendor ID for YotaDevicesDanielMo2014-01-061-0/+3
| | * adb: Add USB vendor ID for TechFaithDanielMo2014-01-061-0/+3
| | * adb: Add USB vendor ID for RockchipDanielMo2014-01-061-0/+3
| | * adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.DanielMo2014-01-061-0/+3
| | * adb: Add USB vendor ID for AllwinnerDanielMo2014-01-061-0/+3
| | * adb: Add USB vendor ID for AmlogicDanielMo2014-01-061-0/+3
| | * added Gigaset's USB vendor IDVolker Moesker2014-01-061-1/+3
| | * adb: alphabetically sort usb vendors listsColin Cross2014-01-061-150/+155
* | | am 2bd34772: am 42fb1783: am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB ...Colin Cross2014-01-031-1/+1
|\ \ \ | |/ /
| * | am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"Colin Cross2014-01-031-1/+1
| |\ \ | | |/
| | * Merge "Modify BYD's USB Vendor ID"Colin Cross2014-01-031-1/+1
| | |\
| | | * Modify BYD's USB Vendor IDkongfanqing2013-05-151-1/+1
* | | | am 4bacd1fb: am 4af0c74e: am 8be1ccff: am fcf3d207: Merge "adb: configure /sy...Nick Kralevich2014-01-032-10/+65
|\ \ \ \ | |/ / /
| * | | am fcf3d207: Merge "adb: configure /system file permission with fs_config"Nick Kralevich2014-01-032-10/+65
| |\ \ \ | | |/ /
| | * | adb: configure /system file permission with fs_configLiang Cheng2014-01-022-10/+65
* | | | am 4639ae45: am a0ce4e28: am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\...Nick Kralevich2013-12-193-21/+88
|\ \ \ \ | |/ / /
| * | | am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."Nick Kralevich2013-12-193-21/+88
| |\ \ \ | | |/ /
| | * | adb: Check sender's socket id when receiving packets.David 'Digit' Turner2013-12-163-21/+88
* | | | Merge "adb: deprecate legacy log service interface"Mark Salyzyn2013-12-105-103/+1
|\ \ \ \
| * | | | adb: deprecate legacy log service interfaceMark Salyzyn2013-12-105-103/+1
* | | | | am 81b488e6: am a91a47c3: am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf:...Nick Kralevich2013-12-101-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7:...Nick Kralevich2013-12-101-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e:...Nick Kralevich2013-12-101-2/+2
| | |\ \
| | | * \ am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29:...Nick Kralevich2013-12-101-2/+2
| | | |\ \
| | | | * \ am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078:...Nick Kralevich2013-12-101-2/+2
| | | | |\ \
| | | | | * \ am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd:...Nick Kralevich2013-12-101-2/+2
| | | | | |\ \
| | | | | | * \ am d63fb078: am e89e09dd: Fix overflow in adb_clientNick Kralevich2013-12-101-2/+2
| | | | | | |\ \
| | | | | | | * \ am e89e09dd: Fix overflow in adb_clientNick Kralevich2013-12-101-2/+2
| | | | | | | |\ \
| | | | | | | | * | Fix overflow in adb_clientNick Kralevich2013-12-101-2/+2
* | | | | | | | | | adb: regression from Move list.c to inlinesMark Salyzyn2013-12-061-1/+1
* | | | | | | | | | adb: Don't clobber block devices during pushJP Abgrall2013-12-031-3/+6
|/ / / / / / / / /
* | | | | | | | | am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."Elliott Hughes2013-10-292-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a bunch of small system/core bugs.Elliott Hughes2013-10-292-1/+2
* | | | | | | | | | am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"Brian Carlstrom2013-10-282-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Improve some adb error loggingBrian Carlstrom2013-10-272-2/+4