summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 803fb62b: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-077-25/+1
|\
| * Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-077-25/+1
| |\
| | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-077-25/+1
* | | am d9e3bc3f: Merge "Use bionic\'s <linux/fuse.h>."Elliott Hughes2014-05-072-594/+15
|\ \ \ | |/ /
| * | Merge "Use bionic's <linux/fuse.h>."Elliott Hughes2014-05-072-594/+15
| |\ \
| | * | Use bionic's <linux/fuse.h>.Elliott Hughes2014-05-072-594/+15
| | |/
* | | am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."Elliott Hughes2014-05-071-4/+2
|\ \ \ | |/ /
| * | Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."Elliott Hughes2014-05-071-4/+2
| |\ \
| | * | Fix mips debuggerd <corkscrew/ptrace.h> build breakage.Elliott Hughes2014-05-071-4/+2
| |/ /
* | | am a744f0a1: Merge "System: Fastboot: warning fixit, misc bugs and cleanup."Sasha Levitskiy2014-05-074-60/+60
|\ \ \ | |/ /
| * | Merge "System: Fastboot: warning fixit, misc bugs and cleanup."Sasha Levitskiy2014-05-074-60/+60
| |\ \ | | |/ | |/|
| | * System: Fastboot: warning fixit, misc bugs and cleanup.Sasha Levitskiy2014-05-074-60/+60
| |/
* | am 7112e4c7: Merge "Remove the dead corkscrew header files too."Elliott Hughes2014-05-075-424/+0
|\ \ | |/
| * Merge "Remove the dead corkscrew header files too."Elliott Hughes2014-05-075-424/+0
| |\
| | * Remove the dead corkscrew header files too.Elliott Hughes2014-05-075-424/+0
| |/
* | am 2c55b454: Merge "Switch to the new bionic fatal logging interface."Elliott Hughes2014-05-072-12/+14
|\ \ | |/
| * Merge "Switch to the new bionic fatal logging interface."Elliott Hughes2014-05-072-12/+14
| |\
| | * Switch to the new bionic fatal logging interface.Elliott Hughes2014-05-062-12/+14
* | | am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"JP Abgrall2014-05-075-23/+74
|\ \ \ | |/ /
| * | Merge "fastboot: support for overriding format fs-type and size"JP Abgrall2014-05-075-23/+74
| |\ \
| | * | fastboot: support for overriding format fs-type and sizeJP Abgrall2014-05-065-23/+74
* | | | am 9570d837: Merge "logd: logcat: Add persist.logd.size group of properties"Mark Salyzyn2014-05-063-4/+81
|\ \ \ \ | |/ / /
| * | | Merge "logd: logcat: Add persist.logd.size group of properties"Mark Salyzyn2014-05-063-4/+81
| |\ \ \
| | * | | logd: logcat: Add persist.logd.size group of propertiesMark Salyzyn2014-05-063-4/+81
| |/ / /
* | | | am 5c02b276: Merge "logd: default off by-UID spam filter"Mark Salyzyn2014-05-061-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "logd: default off by-UID spam filter"Mark Salyzyn2014-05-061-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | logd: default off by-UID spam filterMark Salyzyn2014-05-061-2/+2
| |/ /
* | | am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cabJP Abgrall2014-05-066-212/+155
|\ \ \ | |/ /
| * | Merge changes Ibff1f74e,Ic82595cf,If4e01cabJP Abgrall2014-05-066-212/+155
| |\ \
| | * | fastboot: Added tos as an optional imageDaniel Rosenberg2014-05-061-2/+5
| | * | fastboot: Fixed optional entriesDaniel Rosenberg2014-05-061-1/+1
| | * | fastboot: allow format on devices with small buffersDmitry Grinberg2014-05-066-209/+149
| |/ /
* | | am 52dd7cc0: Merge "Fix 64-bit host build."Ying Wang2014-05-062-6/+6
|\ \ \ | |/ /
| * | Merge "Fix 64-bit host build."Ying Wang2014-05-062-6/+6
| |\ \
| | * | Fix 64-bit host build.Ying Wang2014-05-062-6/+6
| |/ /
* | | am 8e26b252: Merge "Fastboot: fix fastboot timeout issue of Windows host side"JP Abgrall2014-05-061-3/+3
|\ \ \ | |/ /
| * | Merge "Fastboot: fix fastboot timeout issue of Windows host side"JP Abgrall2014-05-061-3/+3
| |\ \ | | |/ | |/|
| | * Fastboot: fix fastboot timeout issue of Windows host sideJiebing Li2014-04-251-3/+3
* | | am b52a48af: Merge "Log stack even if tombstone cannot be created."Christopher Ferris2014-05-051-10/+17
|\ \ \ | |/ /
| * | Merge "Log stack even if tombstone cannot be created."Christopher Ferris2014-05-051-10/+17
| |\ \
| | * | Log stack even if tombstone cannot be created.Christopher Ferris2014-05-051-10/+17
* | | | am 752115dd: Merge "Add Silvermont architecture cache sizes"Elliott Hughes2014-05-051-2/+9
|\ \ \ \ | |/ / /
| * | | Merge "Add Silvermont architecture cache sizes"Elliott Hughes2014-05-051-2/+9
| |\ \ \
| | * | | Add Silvermont architecture cache sizesHenrik Smiding2014-04-181-2/+9
* | | | | am f2c0f328: Merge "libcutils: win_sdk build issues"Mark Salyzyn2014-05-053-5/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge "libcutils: win_sdk build issues"Mark Salyzyn2014-05-053-5/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | libcutils: win_sdk build issuesMark Salyzyn2014-05-053-5/+14
| |/ / /
* | | | am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"Colin Cross2014-05-031-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "mkbootimg: fix padding calculation for 2ndstage loader"Colin Cross2014-05-031-1/+1
| |\ \ \
| | * | | mkbootimg: fix padding calculation for 2ndstage loaderAndrew Boie2014-04-241-1/+1
| | | |/ | | |/|