summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix x86_64 build"Dmitriy Ivanov2015-02-041-2/+2
|\
| * Fix x86_64 buildDmitriy Ivanov2015-02-031-2/+2
* | Merge "android_reboot should take a const char*."Elliott Hughes2015-02-042-2/+2
|\ \ | |/ |/|
| * android_reboot should take a const char*.Elliott Hughes2015-02-032-2/+2
|/
* Merge "Add Google-style StringPrintf."Elliott Hughes2015-02-035-0/+175
|\
| * Add Google-style StringPrintf.Elliott Hughes2015-02-035-0/+175
* | Merge "Init: Fix Clang unsupported attributes"Elliott Hughes2015-02-031-0/+6
|\ \
| * | Init: Fix Clang unsupported attributesAndreas Gampe2015-02-031-0/+6
* | | Merge "Extra Win32 compatibility."Elliott Hughes2015-02-031-0/+6
|\ \ \ | |_|/ |/| |
| * | Extra Win32 compatibility.Elliott Hughes2015-02-031-0/+6
|/ /
* | Merge "Fix Mac build."Elliott Hughes2015-02-031-0/+2
|\ \
| * | Fix Mac build.Elliott Hughes2015-02-031-0/+2
|/ /
* | Merge "Add Google-style ReadFileToString and WriteStringToFile."Elliott Hughes2015-02-035-10/+138
|\ \
| * | Add Google-style ReadFileToString and WriteStringToFile.Elliott Hughes2015-02-035-10/+138
* | | Merge "Remove netcfg's unused options."Elliott Hughes2015-02-033-95/+26
|\ \ \
| * | | Remove netcfg's unused options.Elliott Hughes2015-02-033-95/+26
|/ / /
* | | Merge "Revert "Remove netcfg's unused options.""Elliott Hughes2015-02-035-26/+116
|\ \ \
| * | | Revert "Remove netcfg's unused options."Elliott Hughes2015-02-035-26/+116
* | | | Merge "Init: Fix literal"Andreas Gampe2015-02-031-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Init: Fix literalAndreas Gampe2015-02-031-1/+1
|/ / /
* | | Merge "Remove netcfg's unused options."Elliott Hughes2015-02-035-116/+26
|\ \ \ | |/ /
| * | Remove netcfg's unused options.Elliott Hughes2015-02-035-116/+26
* | | Merge "Revert "Remove netcfg's unused options.""Elliott Hughes2015-02-035-26/+116
|\ \ \
| * | | Revert "Remove netcfg's unused options."Elliott Hughes2015-02-035-26/+116
* | | | Merge "Remove netcfg's unused options."Elliott Hughes2015-02-035-116/+26
|\ \ \ \ | |/ / /
| * | | Remove netcfg's unused options.Elliott Hughes2015-02-025-116/+26
| |/ /
* | | Merge "Trivial cleanup of recent changes."Elliott Hughes2015-02-033-6/+9
|\ \ \ | |_|/ |/| |
| * | Trivial cleanup of recent changes.Elliott Hughes2015-02-023-6/+9
|/ /
* | Merge "init: Implement 'exec' command."Elliott Hughes2015-02-036-4/+74
|\ \
| * | init: Implement 'exec' command.San Mehat2015-02-026-4/+74
|/ /
* | Merge "init: Add support "&&" operator in property triggers"Elliott Hughes2015-02-035-56/+128
|\ \
| * | init: Add support "&&" operator in property triggersBadhri Jagan Sridharan2015-02-025-56/+128
|/ /
* | Merge "Add O_CLOEXEC to lots of open() calls."Nick Kralevich2015-02-028-44/+31
|\ \ | |/ |/|
| * Add O_CLOEXEC to lots of open() calls.Nick Kralevich2015-02-028-44/+31
|/
* Merge "builtins.c: Don't require file open() for chmod/chown"Nick Kralevich2015-02-021-63/+8
|\
| * builtins.c: Don't require file open() for chmod/chownNick Kralevich2015-02-021-63/+8
* | Merge "The bsddroid project has been dead since 2010."Elliott Hughes2015-02-023-699/+0
|\ \
| * | The bsddroid project has been dead since 2010.Elliott Hughes2015-01-313-699/+0
* | | Merge "Add close_file flag to OpenArchiveFd()"Dmitriy Ivanov2015-02-023-6/+33
|\ \ \ | |_|/ |/| |
| * | Add close_file flag to OpenArchiveFd()Dmitriy Ivanov2015-01-303-6/+33
* | | Merge "ensure /data/tombstones exists on all Android devices"Nick Kralevich2015-01-311-0/+1
|\ \ \ | |_|/ |/| |
| * | ensure /data/tombstones exists on all Android devicesNick Kralevich2015-01-301-0/+1
|/ /
* | Merge "Add missing includes."Elliott Hughes2015-01-303-0/+4
|\ \
| * | Add missing includes.Elliott Hughes2015-01-293-0/+4
|/ /
* | Merge "Add ps --ppid."Elliott Hughes2015-01-301-0/+9
|\ \ | |/ |/|
| * Add ps --ppid.Elliott Hughes2015-01-291-0/+9
|/
* Merge "Remove fastbootd."Dan Albert2015-01-2935-4986/+0
|\
| * Remove fastbootd.Dan Albert2015-01-2935-4986/+0
|/
* Merge changes If22008be,Id0049ce6Paul Lawrence2015-01-284-2/+17
|\
| * Make encryption configurablePaul Lawrence2015-01-284-4/+8