Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD | The Android Open Source Project | 2013-11-22 | 14 | -459/+205 |
|\ | |||||
| * | am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes" | Colin Cross | 2013-10-02 | 1 | -7/+9 |
| |\ | |||||
| * \ | am 876f4366: am a7f6e015: Merge "correct msi usb vendor id." | Elliott Hughes | 2013-08-28 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | am 3042c265: am b3644d8f: Merge "Add USB Vendor ID for WACOM" | Elliott Hughes | 2013-08-16 | 1 | -1/+3 |
| |\ \ \ | |||||
| * \ \ \ | am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI" | Elliott Hughes | 2013-08-12 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge "Move liblog headers to system/core/include/log" | Colin Cross | 2013-07-25 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move liblog headers to system/core/include/log | Colin Cross | 2013-07-24 | 2 | -2/+2 |
| * | | | | | | am 09f240e0: am 5d855432: Merge "Add USB Vendor ID for ECS" | Elliott Hughes | 2013-07-25 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am 98c02528: am 19188955: am d92e35eb: Merge "Add Qisda usb config" | Elliott Hughes | 2013-06-18 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 88411498: am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size... | Elliott Hughes | 2013-06-17 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am 1aeefcd6: am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook,... | Elliott Hughes | 2013-06-17 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | adb: Only use properties on device builds | Nick Kralevich | 2013-05-23 | 4 | -1/+5 |
| * | | | | | | | | | Merge "adb: Handle adb connect in a thread" | Benoit Goby | 2013-04-25 | 4 | -122/+170 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | adb: Handle adb connect in a thread | Benoit Goby | 2013-04-25 | 4 | -122/+170 |
| * | | | | | | | | | | Merge "fs_mgr: make block devices read-only" | Nick Kralevich | 2013-04-25 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | fs_mgr: make block devices read-only | Nick Kralevich | 2013-04-24 | 1 | -0/+9 |
| * | | | | | | | | | | adb: Cleanup dead code | Benoit Goby | 2013-04-24 | 8 | -314/+7 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Make init handle reboots | Nick Kralevich | 2013-04-23 | 2 | -21/+12 |
| * | | | | | | | | | am b544da0b: am d7cab8bf: Merge "adb : add missing connection states" | Colin Cross | 2013-04-17 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am ac76c1f1: am ffc5a4a5: Merge "Add OUYA VID to known VID list" | Elliott Hughes | 2013-04-17 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | mincrypt: support SHA-256 hash algorithm | Doug Zongker | 2013-04-10 | 1 | -1/+2 |
| * | | | | | | | | | | | am 9f25178a: am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twic... | Benoit Goby | 2013-04-02 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am b1d20464: am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c" | Colin Cross | 2013-03-29 | 1 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am 78420edc: resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp | Benoit Goby | 2013-03-29 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | toolbox: Make reboot a separate command from toolbox | Benoit Goby | 2013-03-26 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | Fix a bunch of small system/core bugs. | Elliott Hughes | 2013-10-29 | 2 | -1/+2 |
* | | | | | | | | | | | | | | | Improve some adb error logging | Brian Carlstrom | 2013-10-27 | 2 | -2/+4 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge "Handle screendumps for all framebuffer sizes" | Colin Cross | 2013-10-02 | 1 | -7/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Handle screendumps for all framebuffer sizes | Chris Dearman | 2013-09-25 | 1 | -7/+9 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | mincrypt: support SHA-256 hash algorithm | Doug Zongker | 2013-09-25 | 1 | -1/+2 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | correct msi usb vendor id. | astonehuang | 2013-08-28 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Add USB Vendor ID for WACOM | Wing Tseng | 2013-08-15 | 1 | -1/+3 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Add USB Vendor ID for MSI | astonehuang | 2013-08-01 | 1 | -0/+3 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge "Add USB Vendor ID for ECS" | Elliott Hughes | 2013-07-25 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Add USB Vendor ID for ECS | ecsgms | 2013-07-24 | 1 | -0/+3 |
* | | | | | | | | | | am d92e35eb: Merge "Add Qisda usb config" | Elliott Hughes | 2013-06-18 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Add Qisda usb config | esther | 2013-06-18 | 1 | -0/+3 |
* | | | | | | | | | am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB" | Elliott Hughes | 2013-06-17 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Merge "adb: fix reported transfer size for transfer over 4 GiB" | Elliott Hughes | 2013-06-17 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | adb: fix reported transfer size for transfer over 4 GiB | Jeff Smith | 2013-06-15 | 1 | -3/+3 |
* | | | | | | | | | am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK" | Elliott Hughes | 2013-06-17 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | adb: add vendor ID's for Nook, Haier, Hisense, and MTK | Jeff Smith | 2013-06-17 | 1 | -0/+12 |
| |/ / / / / / | |||||
| * | | | | | | Host builds: add fastboot and adb | Kenny Root | 2013-05-02 | 1 | -0/+1 |
* | | | | | | | am d7cab8bf: Merge "adb : add missing connection states" | Colin Cross | 2013-04-17 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merge "adb : add missing connection states" | Colin Cross | 2013-04-17 | 1 | -0/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | adb : add missing connection states | trevd | 2013-04-17 | 1 | -0/+4 |
* | | | | | | | am ffc5a4a5: Merge "Add OUYA VID to known VID list" | Elliott Hughes | 2013-04-17 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Add OUYA VID to known VID list | Al Sutton | 2013-04-17 | 1 | -0/+3 |
| |/ / / / | |||||
* | | | | | am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr... | Benoit Goby | 2013-04-02 | 1 | -4/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | adb: Prevent registering usb_disconnect twice | Benoit Goby | 2013-04-01 | 1 | -4/+6 |
| | |/ / | |/| | |