summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "toolbox: ioctl: fix signedness on ioctl_nr"Elliott Hughes2015-04-021-49/+96
|\
| * toolbox: ioctl: fix signedness on ioctl_nrChris Fries2015-04-011-49/+96
* | Merge "Fix shared version of libcutils on the host to include strlcpy"Brian Carlstrom2015-04-021-1/+1
|\ \
| * | Fix shared version of libcutils on the host to include strlcpyBrian Carlstrom2015-04-021-1/+1
|/ /
* | Merge "sdcard: Turn on noatime for fuse mounted sdcard"Elliott Hughes2015-04-021-1/+2
|\ \
| * | sdcard: Turn on noatime for fuse mounted sdcardJohan Redestig2015-01-251-1/+2
* | | Merge "Discards frames for code within library."Christopher Ferris2015-04-024-17/+54
|\ \ \
| * | | Discards frames for code within library.Christopher Ferris2015-04-014-17/+54
* | | | Merge "Revert "Disable the static libcutils tests.""Dan Albert2015-04-011-17/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Disable the static libcutils tests."Dan Albert2015-04-011-17/+15
|/ / /
* | | Merge "Link libc++_static into fs_mgr."Dan Albert2015-04-011-0/+1
|\ \ \
| * | | Link libc++_static into fs_mgr.Dan Albert2015-04-011-0/+1
|/ / /
* | | Merge "logd: missing include for string.h"Mark Salyzyn2015-04-011-0/+1
|\ \ \
| * | | logd: missing include for string.hMark Salyzyn2015-04-011-0/+1
* | | | Merge "package missing include for string.h"Mark Salyzyn2015-04-011-2/+4
|\ \ \ \
| * | | | package missing include for string.hMark Salyzyn2015-04-011-2/+4
| |/ / /
* | | | Merge "Remove no-op "capabilities"."Elliott Hughes2015-04-012-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove no-op "capabilities".Elliott Hughes2015-04-012-4/+0
* | | | 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
|/ / / / /