summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."Ian Rogers2013-02-011-123/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."Ian Rogers2013-02-021-123/+33
| |\ \ \ \ \ \
| | * | | | | | Inline ldrex/strex for thumb2, remove ARMv5 remnants.Ian Rogers2013-02-011-123/+33
* | | | | | | | Merge from jb-mr1.1-devJean-Baptiste Queru2013-02-010-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am cf5c32c2: charger: Do not suspend when disconnecting from chargerDevin Kim2013-02-010-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | charger: Do not suspend when disconnecting from chargerDevin Kim2013-01-221-1/+2
| * | | | | | | | | am dec27f6e: (-s ours) charger: suspend enable in charger modechoongryeol.lee2013-02-010-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | charger: suspend enable in charger modechoongryeol.lee2013-01-222-1/+31
| * | | | | | | | | am fdf2f337: libsuspend: compile as a static libraryIliyan Malchev2013-01-300-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | libsuspend: compile as a static libraryIliyan Malchev2013-01-221-1/+9
* | | | | | | | | | am b2639f40: Merge "Label sockets consistently with the seclabel value if spe...Colin Cross2013-02-011-19/+27
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Label sockets consistently with the seclabel value if specified."Colin Cross2013-02-011-19/+27
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Label sockets consistently with the seclabel value if specified.Stephen Smalley2012-11-161-19/+27
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on...Kenny Root2013-01-291-0/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"Kenny Root2013-01-291-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"Kenny Root2013-01-301-0/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Windows adb: include stdint.h for uint8_t on MinGW-w64Ray Donnelly2013-01-081-0/+1
* | | | | | | | | | | am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_t...Kenny Root2013-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"Kenny Root2013-01-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"Kenny Root2013-01-301-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Windows adb: initialize on to 1 in disable_tcp_nagleRay Donnelly2013-01-111-1/+1
* | | | | | | | | | | | resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aospDoug Zongker2013-01-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | change AID_LOOP_RADIO uid assignmentDoug Zongker2013-01-291-1/+1
* | | | | | | | | | | | | resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aospDoug Zongker2013-01-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | add AID_LOOP_RADIO for control of loop radio deviceDoug Zongker2013-01-291-0/+2
* | | | | | | | | | | | am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."Elliott Hughes2013-01-291-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "libcorkscrew will always HAVE_DLADDR."Elliott Hughes2013-01-291-4/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | libcorkscrew will always HAVE_DLADDR.Elliott Hughes2013-01-251-4/+0
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 61ae5dfd: Merge "fastboot: add errno.h to fix windows build"Colin Cross2013-01-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "fastboot: add errno.h to fix windows build"Colin Cross2013-01-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fastboot: add errno.h to fix windows buildColin Cross2013-01-231-0/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 2447afdb: Merge "fastboot: use better exported api from libext4_utils"Colin Cross2013-01-231-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "fastboot: use better exported api from libext4_utils"Colin Cross2013-01-241-6/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fastboot: use better exported api from libext4_utilsColin Cross2013-01-231-6/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 98d07897: Merge "Windows adb: Make client stdout and stderr handles uninhe...David Turner2013-01-211-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Windows adb: Make client stdout and stderr handles uninheritable"David Turner2013-01-211-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Windows adb: Make client stdout and stderr handles uninheritableRay Donnelly2013-01-081-0/+21
* | | | | | | | | | | | am 026b3953: Merge "The localtime_tz and mktime_tz extensions are now in bion...Elliott Hughes2013-01-156-3382/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "The localtime_tz and mktime_tz extensions are now in bionic."Elliott Hughes2013-01-156-3382/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | The localtime_tz and mktime_tz extensions are now in bionic.Elliott Hughes2013-01-156-3382/+1
| |/ / / / / / / / / /
* | | | | | | | | | | am ef2ea99b: Merge "Correct LOCAL_LDLIBS of adb"Ying Wang2013-01-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Correct LOCAL_LDLIBS of adb"Ying Wang2013-01-081-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Correct LOCAL_LDLIBS of adbChih-Wei Huang2013-01-011-2/+2
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
* | | | | | | | | | | am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set"Elliott Hughes2013-01-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Fix dhcpcd startup when net.hostname is not set"Elliott Hughes2013-01-071-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix dhcpcd startup when net.hostname is not setMatt Gumbel2013-01-041-1/+1
* | | | | | | | | | | | am fb69c2e2: Merge "init.rc: setup qtaguid group ownership of ctrl and stat f...JP Abgrall2013-01-041-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "init.rc: setup qtaguid group ownership of ctrl and stat files"JP Abgrall2013-01-041-0/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | init.rc: setup qtaguid group ownership of ctrl and stat filesJP Abgrall2013-01-041-0/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | am d084ec96: Merge "ueventd: Increase uevent buffer size"jp abgrall2013-01-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /