summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEADThe Android Open Source Project2013-11-2214-459/+205
|\
| * am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"Colin Cross2013-10-021-7/+9
| |\
| * \ am 876f4366: am a7f6e015: Merge "correct msi usb vendor id."Elliott Hughes2013-08-281-1/+1
| |\ \
| * \ \ am 3042c265: am b3644d8f: Merge "Add USB Vendor ID for WACOM"Elliott Hughes2013-08-161-1/+3
| |\ \ \
| * \ \ \ am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"Elliott Hughes2013-08-121-0/+3
| |\ \ \ \
| * \ \ \ \ Merge "Move liblog headers to system/core/include/log"Colin Cross2013-07-252-2/+2
| |\ \ \ \ \
| | * | | | | Move liblog headers to system/core/include/logColin Cross2013-07-242-2/+2
| * | | | | | am 09f240e0: am 5d855432: Merge "Add USB Vendor ID for ECS"Elliott Hughes2013-07-251-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 98c02528: am 19188955: am d92e35eb: Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 88411498: am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size...Elliott Hughes2013-06-171-3/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 1aeefcd6: am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook,...Elliott Hughes2013-06-171-0/+12
| |\ \ \ \ \ \ \ \
| * | | | | | | | | adb: Only use properties on device buildsNick Kralevich2013-05-234-1/+5
| * | | | | | | | | Merge "adb: Handle adb connect in a thread"Benoit Goby2013-04-254-122/+170
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | adb: Handle adb connect in a threadBenoit Goby2013-04-254-122/+170
| * | | | | | | | | | Merge "fs_mgr: make block devices read-only"Nick Kralevich2013-04-251-0/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | fs_mgr: make block devices read-onlyNick Kralevich2013-04-241-0/+9
| * | | | | | | | | | adb: Cleanup dead codeBenoit Goby2013-04-248-314/+7
| |/ / / / / / / / /
| * | | | | | | | | Make init handle rebootsNick Kralevich2013-04-232-21/+12
| * | | | | | | | | am b544da0b: am d7cab8bf: Merge "adb : add missing connection states"Colin Cross2013-04-171-0/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am ac76c1f1: am ffc5a4a5: Merge "Add OUYA VID to known VID list"Elliott Hughes2013-04-171-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mincrypt: support SHA-256 hash algorithmDoug Zongker2013-04-101-1/+2
| * | | | | | | | | | | am 9f25178a: am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twic...Benoit Goby2013-04-021-4/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am b1d20464: am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c"Colin Cross2013-03-291-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 78420edc: resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aospBenoit Goby2013-03-291-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | toolbox: Make reboot a separate command from toolboxBenoit Goby2013-03-261-1/+2
* | | | | | | | | | | | | | | Fix a bunch of small system/core bugs.Elliott Hughes2013-10-292-1/+2
* | | | | | | | | | | | | | | Improve some adb error loggingBrian Carlstrom2013-10-272-2/+4
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Handle screendumps for all framebuffer sizes"Colin Cross2013-10-021-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Handle screendumps for all framebuffer sizesChris Dearman2013-09-251-7/+9
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | mincrypt: support SHA-256 hash algorithmDoug Zongker2013-09-251-1/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | correct msi usb vendor id.astonehuang2013-08-281-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Add USB Vendor ID for WACOMWing Tseng2013-08-151-1/+3
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Add USB Vendor ID for MSIastonehuang2013-08-011-0/+3
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge "Add USB Vendor ID for ECS"Elliott Hughes2013-07-251-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Add USB Vendor ID for ECSecsgms2013-07-241-0/+3
* | | | | | | | | | am d92e35eb: Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add Qisda usb configesther2013-06-181-0/+3
* | | | | | | | | am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"Elliott Hughes2013-06-171-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge "adb: fix reported transfer size for transfer over 4 GiB"Elliott Hughes2013-06-171-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | adb: fix reported transfer size for transfer over 4 GiBJeff Smith2013-06-151-3/+3
* | | | | | | | | am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK"Elliott Hughes2013-06-171-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | adb: add vendor ID's for Nook, Haier, Hisense, and MTKJeff Smith2013-06-171-0/+12
| |/ / / / / /
| * | | | | | Host builds: add fastboot and adbKenny Root2013-05-021-0/+1
* | | | | | | am d7cab8bf: Merge "adb : add missing connection states"Colin Cross2013-04-171-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge "adb : add missing connection states"Colin Cross2013-04-171-0/+4
| |\ \ \ \ \
| | * | | | | adb : add missing connection statestrevd2013-04-171-0/+4
* | | | | | | am ffc5a4a5: Merge "Add OUYA VID to known VID list"Elliott Hughes2013-04-171-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Add OUYA VID to known VID listAl Sutton2013-04-171-0/+3
| |/ / / /
* | | | | am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr...Benoit Goby2013-04-021-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | adb: Prevent registering usb_disconnect twiceBenoit Goby2013-04-011-4/+6
| | |/ / | |/| |