summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add USB Vendor ID for ECS"Elliott Hughes2013-07-251-0/+3
|\
| * Add USB Vendor ID for ECSecsgms2013-07-241-0/+3
* | am 5954ecb8: Merge "Allow more characters in partition name links"Colin Cross2013-07-222-3/+18
|\ \ | |/
| * Merge "Allow more characters in partition name links"Colin Cross2013-07-222-3/+18
| |\
| | * Allow more characters in partition name linksJohan Redestig2013-07-182-3/+18
| |/
* | am f265426f: am 596ee9ea: Merge "Improve the crasher stack-overflow command."Elliott Hughes2013-07-161-2/+4
|\ \
| * \ am 596ee9ea: Merge "Improve the crasher stack-overflow command."Elliott Hughes2013-07-161-2/+4
| |\ \ | | |/
| | * Merge "Improve the crasher stack-overflow command."Elliott Hughes2013-07-161-2/+4
| | |\
| | | * Improve the crasher stack-overflow command.Elliott Hughes2013-07-151-2/+4
| | |/
* | | init.rc: remove "on fs" sectionNick Kralevich2013-07-121-8/+0
* | | am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs"Nick Kralevich2013-07-121-4/+4
|\ \ \ | |/ /
| * | am fb1c9cf6: Merge "use ext4 instead of yaffs"Nick Kralevich2013-07-121-4/+4
| |\ \ | | |/
| | * Merge "use ext4 instead of yaffs"Nick Kralevich2013-07-121-4/+4
| | |\
| | | * use ext4 instead of yaffsNick Kralevich2013-07-091-4/+4
* | | | am a9396549: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5ed...Elliott Hughes2013-07-111-10/+0
|\ \ \ \ | |/ / /
| * | | Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f...Elliott Hughes2013-07-111-10/+0
* | | | am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5ed...Elliott Hughes2013-07-111-1/+1
|\ \ \ \ | |/ / /
| * | | Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.Elliott Hughes2013-07-111-1/+1
* | | | am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-masterElliott Hughes2013-07-111-0/+10
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 42031e0e to stage-aosp-masterElliott Hughes2013-07-111-0/+10
| |\ \ \ | | |/ /
| | * | Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds"Ken Sumrall2013-07-101-1/+1
| | |\ \ | | | |/ | | |/|
| | | * fs_mgr_priv: Extend fs wait timeout to 20 secondsAndrew Boie2013-01-041-1/+1
* | | | am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, ...Colin Cross2013-07-030-0/+0
|\ \ \ \ | |/ / /
| * | | am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android em...Colin Cross2013-07-030-0/+0
| |\ \ \ | | |/ /
| | * | Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by de...Colin Cross2013-07-031-0/+1
| | |\ \
| | | * | Added net.dns1 prop for emulator, as Android emulator ignores it by default.Ron Munitz2013-05-171-0/+1
* | | | | 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
* | | | | | 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
* | | | | | 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
| | |/ / / /
* | | | | | 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
| | |/ / / /
* | | | | | am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-masterColin Cross2013-06-176-105/+74
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 95a41f6b to stage-aosp-masterColin Cross2013-06-176-105/+74
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge changes Ia7b337e1,I7a2d8aa5,Iacc2b42b,Idf6100d1,If3fba2ccColin Cross2013-06-186-107/+76
| | |\ \ \ \
| | | * | | | init: fix copying boot propertiesColin Cross2013-06-171-1/+3
| | | * | | | toolbox: hide property implementation from watchpropsColin Cross2013-06-171-17/+16