summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 9259663c: am f17f5591: am 36d44740: Merge "Fix a bunch of small system/cor...Elliott Hughes2013-10-299-4/+17
|\
| * am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."Elliott Hughes2013-10-299-4/+17
| |\
| | * am 36d44740: Merge "Fix a bunch of small system/core bugs."Elliott Hughes2013-10-299-4/+17
| | |\
| | | * Merge "Fix a bunch of small system/core bugs."Elliott Hughes2013-10-299-4/+17
| | | |\
| | | | * Fix a bunch of small system/core bugs.Elliott Hughes2013-10-299-4/+17
| | | |/
* | | | resolved conflicts for merge of 0433d622 to masterChristopher Ferris2013-10-2928-1059/+2398
|\ \ \ \ | |/ / /
| * | | am 0f26808e: am 98f87d92: Merge "Rewrite libbacktrace using C++."Christopher Ferris2013-10-2928-1059/+2398
| |\ \ \ | | |/ /
| | * | am 98f87d92: Merge "Rewrite libbacktrace using C++."Christopher Ferris2013-10-2928-1059/+2398
| | |\ \ | | | |/
| | | * Merge "Rewrite libbacktrace using C++."Christopher Ferris2013-10-2928-1059/+2398
| | | |\
| | | | * Rewrite libbacktrace using C++.Christopher Ferris2013-10-2828-1059/+2398
* | | | | Merge "Add -n option to ps to print numeric uid"Marco Nelissen2013-10-291-10/+13
|\ \ \ \ \
| * | | | | Add -n option to ps to print numeric uidMarco Nelissen2013-10-251-10/+13
* | | | | | libnl: Add nl_socket_set_nonblocking() functionDmitry Shmidt2013-10-281-0/+12
* | | | | | am 406abdc8: am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"Brian Carlstrom2013-10-282-2/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"Brian Carlstrom2013-10-282-2/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 87af04a4: Merge "Improve some adb error logging"Brian Carlstrom2013-10-282-2/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Improve some adb error logging"Brian Carlstrom2013-10-282-2/+4
| | | |\ \ \
| | | | * | | Improve some adb error loggingBrian Carlstrom2013-10-272-2/+4
| | | |/ / /
* | | | | | am 0bf7924d: am 91704522: Don\'t return immediately from reboot commands.Nick Kralevich2013-10-242-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 91704522: Don\'t return immediately from reboot commands.Nick Kralevich2013-10-242-0/+9
| |\ \ \ \ \
| | * | | | | Don't return immediately from reboot commands.Nick Kralevich2013-10-242-0/+9
* | | | | | | am 396f6b77: am c3d04aab: am 4d87e743: Merge "Eliminate text relocations in x...Elliott Hughes2013-10-242-8/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am c3d04aab: am 4d87e743: Merge "Eliminate text relocations in x86 optimized ...Elliott Hughes2013-10-242-8/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"Elliott Hughes2013-10-242-8/+8
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Eliminate text relocations in x86 optimized memset versions"Elliott Hughes2013-10-242-8/+8
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Eliminate text relocations in x86 optimized memset versionsPavel Chupin2013-10-242-8/+8
| | | |/ /
* | | | | healthd: remove/rearrange extra battery property handlingTodd Poynor2013-10-221-18/+10
* | | | | healthd: remove service batterypropregTodd Poynor2013-10-221-1/+0
* | | | | healthd: rename service batterypropreg => batterypropertiesTodd Poynor2013-10-221-0/+1
* | | | | healthd: BatteryService dumpstate supportTodd Poynor2013-10-226-5/+61
* | | | | healthd: Fixups for systems without batteries or removable batteriesTodd Poynor2013-10-222-16/+30
* | | | | am 37cc29e9: resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aospElliott Hughes2013-10-180-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aospElliott Hughes2013-10-180-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am f1296b9e: Merge "Use %zd for size_t."Elliott Hughes2013-10-181-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge "Use %zd for size_t."Elliott Hughes2013-10-191-1/+1
| | | |\ \
| | | | * | Use %zd for size_t.Elliott Hughes2013-10-181-1/+1
| | | |/ /
* | | | | Merge "Enhance the ioctl toolbox command"Scott Anderson2013-10-181-4/+8
|\ \ \ \ \
| * | | | | Enhance the ioctl toolbox commandScott Anderson2013-10-171-4/+8
* | | | | | am 9b41f452: am a9e453f1: Merge "vold no longer does MS_MOVE; remove tmpfs." ...Jeff Sharkey2013-10-171-3/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am a9e453f1: Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-devJeff Sharkey2013-10-171-3/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-devJeff Sharkey2013-10-181-3/+0
| | |\ \ \ \
| | | * | | | vold no longer does MS_MOVE; remove tmpfs.Jeff Sharkey2013-10-171-3/+0
* | | | | | | am e6cc5659: am 9c39c96a: am b387a7f2: Merge "Wait for device to disappear af...JP Abgrall2013-10-179-59/+122
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am 9c39c96a: am b387a7f2: Merge "Wait for device to disappear after reboot-bo...JP Abgrall2013-10-179-59/+122
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am b387a7f2: Merge "Wait for device to disappear after reboot-bootloader."JP Abgrall2013-10-179-59/+122
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge "Wait for device to disappear after reboot-bootloader."JP Abgrall2013-10-179-59/+122
| | | |\ \ \
| | | | * | | Wait for device to disappear after reboot-bootloader.Mark Wachsler2013-10-179-59/+122
| | | |/ / /
* | | | | | am 308f0f9b: am 95e69261: am ac568b8f: Merge "init: remove obsolete rle logo"JP Abgrall2013-10-174-190/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 95e69261: am ac568b8f: Merge "init: remove obsolete rle logo"JP Abgrall2013-10-174-190/+21
| |\ \ \ \ \ | | |/ / / /
| | * | | | am ac568b8f: Merge "init: remove obsolete rle logo"JP Abgrall2013-10-174-190/+21
| | |\ \ \ \ | | | |/ / /