summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* logd: missing include for string.hMark Salyzyn2015-04-011-0/+1
* Merge "Revert "Revert "Adding e4crypt support"""Paul Lawrence2015-04-019-30/+174
|\
| * Revert "Revert "Adding e4crypt support""Paul Lawrence2015-03-319-30/+174
* | Merge "Add verbose param to sparse_file_import_auto"Mohamad Ayyash2015-04-014-5/+6
|\ \
| * | Add verbose param to sparse_file_import_autoMohamad Ayyash2015-03-314-5/+6
* | | Merge "Define atrace_* functions for both target and host."Richard Uhler2015-04-014-16/+38
|\ \ \
| * | | Define atrace_* functions for both target and host.Richard Uhler2015-03-274-16/+38
* | | | Merge "Refactor the code."Christopher Ferris2015-03-3123-770/+770
|\ \ \ \
| * | | | Refactor the code.Christopher Ferris2015-03-3123-770/+770
| |/ / /
* | | | Merge "Add -Wno-inline-asm to Clang flags."Stephen Hines2015-03-312-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Add -Wno-inline-asm to Clang flags.Stephen Hines2015-03-312-0/+7
* | | | Merge "run-as: bracket capability"Mark Salyzyn2015-03-311-45/+48
|\ \ \ \
| * | | | run-as: bracket capabilityMark Salyzyn2015-03-311-45/+48
|/ / / /
* | | | Merge "adb: Add option to reboot into sideload mode in recovery"Tao Bao2015-03-313-35/+79
|\ \ \ \
| * | | | adb: Add option to reboot into sideload mode in recoveryTao Bao2015-03-313-35/+79
| | |_|/ | |/| |
* | | | Merge "Build init with clang."Elliott Hughes2015-03-311-0/+5
|\ \ \ \
| * | | | Build init with clang.Elliott Hughes2015-03-301-0/+5
|/ / / /
* | | | Merge "Lose route to toybox."Elliott Hughes2015-03-302-114/+0
|\ \ \ \
| * | | | Lose route to toybox.Elliott Hughes2015-03-302-114/+0
* | | | | Merge "Always unlink /dev/__kmsg__."Elliott Hughes2015-03-301-4/+1
|\ \ \ \ \
| * | | | | Always unlink /dev/__kmsg__.Elliott Hughes2015-03-281-4/+1
* | | | | | Merge "Enable building libbase on Windows."Dan Albert2015-03-301-4/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Enable building libbase on Windows.Dan Albert2015-03-301-4/+8
| | |/ / / | |/| | |
* | | | | Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"Elliott Hughes2015-03-301-1/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)Johan Redestig2015-03-301-1/+9
|/ / / /
* | | | Merge "Lose load_policy to toybox."Elliott Hughes2015-03-282-50/+0
|\ \ \ \
| * | | | Lose load_policy to toybox.Elliott Hughes2015-03-282-50/+0
|/ / / /
* | | | Merge "Clarify a few things about bootcharts."Elliott Hughes2015-03-282-14/+13
|\ \ \ \
| * | | | Clarify a few things about bootcharts.Elliott Hughes2015-03-282-14/+13
|/ / / /
* | | | Merge "Revert "Remove the emulator special case from the "adb root" code.""Dan Albert2015-03-281-0/+7
|\ \ \ \
| * | | | Revert "Remove the emulator special case from the "adb root" code."Dan Albert2015-03-281-0/+7
| | |_|/ | |/| |
* | | | Merge "Further cleanup of the logic in device_init."Elliott Hughes2015-03-281-11/+11
|\ \ \ \
| * | | | Further cleanup of the logic in device_init.Elliott Hughes2015-03-281-11/+11
|/ / / /
* | | | Merge "Fix clang build by removing unused locals."Elliott Hughes2015-03-281-9/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix clang build by removing unused locals.Elliott Hughes2015-03-281-9/+3
|/ / /
* | | Merge "Log more timing information from init."Elliott Hughes2015-03-2817-240/+275
|\ \ \ | |/ / |/| |
| * | Log more timing information from init.Elliott Hughes2015-03-2817-240/+275
|/ /
* | Merge "Remove uses of libcxx.mk."Dan Albert2015-03-273-5/+0
|\ \
| * | Remove uses of libcxx.mk.Dan Albert2015-03-273-5/+0
|/ /
* | Merge "Pull in Windows compatibility header."Dan Albert2015-03-271-0/+1
|\ \
| * | Pull in Windows compatibility header.Dan Albert2015-03-261-0/+1
* | | Merge "Include what we use."Dan Albert2015-03-272-0/+2
|\ \ \
| * | | Include what we use.Dan Albert2015-03-262-0/+2
| |/ /
* | | Merge "O_CLOEXEC is O_NOINHERIT on Windows."Dan Albert2015-03-271-1/+1
|\ \ \ | |/ / |/| |
| * | O_CLOEXEC is O_NOINHERIT on Windows.Dan Albert2015-03-261-1/+1
|/ /
* | Merge "adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echo"Dan Albert2015-03-273-11/+909
|\ \
| * | adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echoSpencer Low2015-03-263-11/+909
* | | Merge "Libbacktrace: Use frame-pointer on host"Andreas Gampe2015-03-271-1/+1
|\ \ \ | |_|/ |/| |
| * | Libbacktrace: Use frame-pointer on hostAndreas Gampe2015-03-261-1/+1
* | | Merge "libaudit: limit to 5 selinux denials per sec"Nick Kralevich2015-03-261-1/+1
|\ \ \