summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "toolbox: swap utils"Rom Lemarchand2013-07-024-1/+192
|\
| * toolbox: swap utilsRom Lemarchand2013-06-254-1/+192
* | fastboot: add support for sparse images in flashall and updateRom Lemarchand2013-07-011-95/+171
* | fastboot: Remove legacy MINGW workaroundsRom Lemarchand2013-06-283-90/+4
* | Merge "init: allow disabling selinux via a kernel command line"Nick Kralevich2013-06-281-3/+48
|\ \
| * | init: allow disabling selinux via a kernel command lineNick Kralevich2013-06-281-3/+48
* | | Merge "Add defines for audio offload and non-blocking write"Eric Laurent2013-06-281-1/+33
|\ \ \
| * | | Add defines for audio offload and non-blocking writeRichard Fitzgerald2013-06-271-1/+33
| |/ /
* | | Merge "Do not exit early on errors when -f is specified"Ken Sumrall2013-06-281-4/+11
|\ \ \
| * | | Do not exit early on errors when -f is specifiedKen Sumrall2013-06-261-4/+11
* | | | Merge "Update the touch command to take a human readable timestamp"Ken Sumrall2013-06-281-4/+31
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Update the touch command to take a human readable timestampKen Sumrall2013-06-261-4/+31
* | | Merge "Revert "fastboot: add preflash command to help with large downloads+fl...jp abgrall2013-06-262-21/+10
|\ \ \
| * | | Revert "fastboot: add preflash command to help with large downloads+flash"jp abgrall2013-06-262-21/+10
* | | | am b1e3bb27: am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-a...Colin Cross2013-06-250-0/+0
|\ \ \ \
| * \ \ \ am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-masterColin Cross2013-06-241-28/+5
| |\ \ \ \
| | * \ \ \ resolved conflicts for merge of b6c60285 to stage-aosp-masterColin Cross2013-06-241-28/+5
| | |\ \ \ \
| | | * \ \ \ Merge changes Ieb94caab,I762da21eColin Cross2013-06-251-30/+5
| | | |\ \ \ \
| | | | * | | | init: move initial property area allocation into bionicGreg Hackmann2013-06-191-28/+5
| | | | * | | | property_service: make /dev/__properties__ readableNick Kralevich2013-06-191-4/+2
* | | | | | | | Merge "fastboot: add preflash command to help with large downloads+flash"JP Abgrall2013-06-252-10/+21
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | fastboot: add preflash command to help with large downloads+flashJP Abgrall2013-06-252-10/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "init: move SELinux into enforcing mode."Nick Kralevich2013-06-251-21/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | init: move SELinux into enforcing mode.Nick Kralevich2013-06-251-21/+20
* | | | | | | am 372d668a: am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-254-15/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 83ada447: Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge changes Ib54f39fd,I7e36edd8Colin Cross2013-06-244-15/+38
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | init: Retain traditional restart behavior for critical and oneshot services.Mike Kasick2012-03-224-11/+35
| | | | * | init: Safely restart services to avoid race conditions.Mike Kasick2012-03-221-4/+3
* | | | | | Merge "init: move initial property area allocation into bionic"Greg Hackmann2013-06-191-28/+5
|\ \ \ \ \ \
| * | | | | | init: move initial property area allocation into bionicGreg Hackmann2013-06-181-28/+5
* | | | | | | am 9270f125: am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-190-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am e755dfd4: Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge changes I1db3137b,I0f66144eColin Cross2013-06-192-49/+78
| | | |\ \ \ \
| | | | * | | | toolbox: reimplement watchprops using __system_property_foreach()Greg Hackmann2013-06-181-39/+59
| | | | * | | | libcutils: reimplement property_list() using __system_property_foreach()Greg Hackmann2013-06-181-10/+19
| | | |/ / / /
* | | | | | | Merge "debuggerd: Ignore SIGPIPE"Nick Kralevich2013-06-191-1/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | debuggerd: Ignore SIGPIPENick Kralevich2013-06-181-1/+3
* | | | | | | toolbox: reimplement watchprops using __system_property_foreach()Greg Hackmann2013-06-181-39/+59
* | | | | | | libcutils: reimplement property_list() using __system_property_foreach()Greg Hackmann2013-06-181-10/+19
|/ / / / / /
* | | | | | Merge "Don't use __attribute__(__error__)"Nick Kralevich2013-06-181-2/+1
|\ \ \ \ \ \
| * | | | | | Don't use __attribute__(__error__)Nick Kralevich2013-06-181-2/+1
* | | | | | | am 98c02528: am 19188955: am d92e35eb: Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 19188955: am d92e35eb: Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am d92e35eb: Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "Add Qisda usb config"Elliott Hughes2013-06-181-0/+3
| | | |\ \ \ \
| | | | * | | | Add Qisda usb configesther2013-06-181-0/+3
| | | |/ / / /
* | | | | | | Merge "Set ATRACE_ENABLE() to '0' if not availble"Stephen Hines2013-06-181-1/+1
|\ \ \ \ \ \ \