| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 5954ecb8: Merge "Allow more characters in partition name links" | Colin Cross | 2013-07-22 | 2 | -3/+18 |
|\ \
| |/ |
|
| * | Merge "Allow more characters in partition name links" | Colin Cross | 2013-07-22 | 2 | -3/+18 |
| |\ |
|
| | * | Allow more characters in partition name links | Johan Redestig | 2013-07-18 | 2 | -3/+18 |
| |/ |
|
* | | am f265426f: am 596ee9ea: Merge "Improve the crasher stack-overflow command." | Elliott Hughes | 2013-07-16 | 1 | -2/+4 |
|\ \ |
|
| * \ | am 596ee9ea: Merge "Improve the crasher stack-overflow command." | Elliott Hughes | 2013-07-16 | 1 | -2/+4 |
| |\ \
| | |/ |
|
| | * | Merge "Improve the crasher stack-overflow command." | Elliott Hughes | 2013-07-16 | 1 | -2/+4 |
| | |\ |
|
| | | * | Improve the crasher stack-overflow command. | Elliott Hughes | 2013-07-15 | 1 | -2/+4 |
| | |/ |
|
* | | | init.rc: remove "on fs" section | Nick Kralevich | 2013-07-12 | 1 | -8/+0 |
* | | | am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs" | Nick Kralevich | 2013-07-12 | 1 | -4/+4 |
|\ \ \
| |/ / |
|
| * | | am fb1c9cf6: Merge "use ext4 instead of yaffs" | Nick Kralevich | 2013-07-12 | 1 | -4/+4 |
| |\ \
| | |/ |
|
| | * | Merge "use ext4 instead of yaffs" | Nick Kralevich | 2013-07-12 | 1 | -4/+4 |
| | |\ |
|
| | | * | use ext4 instead of yaffs | Nick Kralevich | 2013-07-09 | 1 | -4/+4 |
* | | | | am a9396549: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5ed... | Elliott Hughes | 2013-07-11 | 1 | -10/+0 |
|\ \ \ \
| |/ / / |
|
| * | | | Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f... | Elliott Hughes | 2013-07-11 | 1 | -10/+0 |
* | | | | am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5ed... | Elliott Hughes | 2013-07-11 | 1 | -1/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8. | Elliott Hughes | 2013-07-11 | 1 | -1/+1 |
* | | | | am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master | Elliott Hughes | 2013-07-11 | 1 | -0/+10 |
|\ \ \ \
| |/ / / |
|
| * | | | resolved conflicts for merge of 42031e0e to stage-aosp-master | Elliott Hughes | 2013-07-11 | 1 | -0/+10 |
| |\ \ \
| | |/ / |
|
| | * | | Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds" | Ken Sumrall | 2013-07-10 | 1 | -1/+1 |
| | |\ \
| | | |/
| | |/| |
|
| | | * | fs_mgr_priv: Extend fs wait timeout to 20 seconds | Andrew Boie | 2013-01-04 | 1 | -1/+1 |
* | | | | am 149a9b68: am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, ... | Colin Cross | 2013-07-03 | 0 | -0/+0 |
|\ \ \ \
| |/ / / |
|
| * | | | am fafcabd0: (-s ours) Merge "Added net.dns1 prop for emulator, as Android em... | Colin Cross | 2013-07-03 | 0 | -0/+0 |
| |\ \ \
| | |/ / |
|
| | * | | Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by de... | Colin Cross | 2013-07-03 | 1 | -0/+1 |
| | |\ \ |
|
| | | * | | Added net.dns1 prop for emulator, as Android emulator ignores it by default. | Ron Munitz | 2013-05-17 | 1 | -0/+1 |
* | | | | | am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master | Colin Cross | 2013-06-24 | 1 | -28/+5 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | resolved conflicts for merge of b6c60285 to stage-aosp-master | Colin Cross | 2013-06-24 | 1 | -28/+5 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Merge changes Ieb94caab,I762da21e | Colin Cross | 2013-06-25 | 1 | -30/+5 |
| | |\ \ \ |
|
| | | * | | | init: move initial property area allocation into bionic | Greg Hackmann | 2013-06-19 | 1 | -28/+5 |
| | | * | | | property_service: make /dev/__properties__ readable | Nick Kralevich | 2013-06-19 | 1 | -4/+2 |
* | | | | | | am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8 | Colin Cross | 2013-06-24 | 4 | -15/+38 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | am 83ada447: Merge changes Ib54f39fd,I7e36edd8 | Colin Cross | 2013-06-24 | 4 | -15/+38 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | Merge changes Ib54f39fd,I7e36edd8 | Colin Cross | 2013-06-24 | 4 | -15/+38 |
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | * | | | init: Retain traditional restart behavior for critical and oneshot services. | Mike Kasick | 2012-03-22 | 4 | -11/+35 |
| | | * | | | init: Safely restart services to avoid race conditions. | Mike Kasick | 2012-03-22 | 1 | -4/+3 |
* | | | | | | am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144e | Colin Cross | 2013-06-19 | 2 | -49/+78 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | am e755dfd4: Merge changes I1db3137b,I0f66144e | Colin Cross | 2013-06-19 | 2 | -49/+78 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | Merge changes I1db3137b,I0f66144e | Colin Cross | 2013-06-19 | 2 | -49/+78 |
| | |\ \ \ \ |
|
| | | * | | | | toolbox: reimplement watchprops using __system_property_foreach() | Greg Hackmann | 2013-06-18 | 1 | -39/+59 |
| | | * | | | | libcutils: reimplement property_list() using __system_property_foreach() | Greg Hackmann | 2013-06-18 | 1 | -10/+19 |
| | |/ / / / |
|
* | | | | | | am 19188955: am d92e35eb: Merge "Add Qisda usb config" | Elliott Hughes | 2013-06-18 | 1 | -0/+3 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | am d92e35eb: Merge "Add Qisda usb config" | Elliott Hughes | 2013-06-18 | 1 | -0/+3 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | 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 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master | Colin Cross | 2013-06-17 | 6 | -105/+74 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | resolved conflicts for merge of 95a41f6b to stage-aosp-master | Colin Cross | 2013-06-17 | 6 | -105/+74 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | Merge changes Ia7b337e1,I7a2d8aa5,Iacc2b42b,Idf6100d1,If3fba2cc | Colin Cross | 2013-06-18 | 6 | -107/+76 |
| | |\ \ \ \ |
|
| | | * | | | | init: fix copying boot properties | Colin Cross | 2013-06-17 | 1 | -1/+3 |
| | | * | | | | toolbox: hide property implementation from watchprops | Colin Cross | 2013-06-17 | 1 | -17/+16 |