Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "toolbox: ioctl: fix signedness on ioctl_nr" | Elliott Hughes | 2015-04-02 | 1 | -49/+96 |
|\ | |||||
| * | toolbox: ioctl: fix signedness on ioctl_nr | Chris Fries | 2015-04-01 | 1 | -49/+96 |
* | | Merge "Fix shared version of libcutils on the host to include strlcpy" | Brian Carlstrom | 2015-04-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix shared version of libcutils on the host to include strlcpy | Brian Carlstrom | 2015-04-02 | 1 | -1/+1 |
|/ / | |||||
* | | Merge "sdcard: Turn on noatime for fuse mounted sdcard" | Elliott Hughes | 2015-04-02 | 1 | -1/+2 |
|\ \ | |||||
| * | | sdcard: Turn on noatime for fuse mounted sdcard | Johan Redestig | 2015-01-25 | 1 | -1/+2 |
* | | | Merge "Discards frames for code within library." | Christopher Ferris | 2015-04-02 | 4 | -17/+54 |
|\ \ \ | |||||
| * | | | Discards frames for code within library. | Christopher Ferris | 2015-04-01 | 4 | -17/+54 |
* | | | | Merge "Revert "Disable the static libcutils tests."" | Dan Albert | 2015-04-01 | 1 | -17/+15 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Revert "Disable the static libcutils tests." | Dan Albert | 2015-04-01 | 1 | -17/+15 |
|/ / / | |||||
* | | | Merge "Link libc++_static into fs_mgr." | Dan Albert | 2015-04-01 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Link libc++_static into fs_mgr. | Dan Albert | 2015-04-01 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge "logd: missing include for string.h" | Mark Salyzyn | 2015-04-01 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | logd: missing include for string.h | Mark Salyzyn | 2015-04-01 | 1 | -0/+1 |
* | | | | Merge "package missing include for string.h" | Mark Salyzyn | 2015-04-01 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | package missing include for string.h | Mark Salyzyn | 2015-04-01 | 1 | -2/+4 |
| |/ / / | |||||
* | | | | Merge "Remove no-op "capabilities"." | Elliott Hughes | 2015-04-01 | 2 | -4/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove no-op "capabilities". | Elliott Hughes | 2015-04-01 | 2 | -4/+0 |
* | | | | Merge "Revert "Revert "Adding e4crypt support""" | Paul Lawrence | 2015-04-01 | 9 | -30/+174 |
|\ \ \ \ | |||||
| * | | | | Revert "Revert "Adding e4crypt support"" | Paul Lawrence | 2015-03-31 | 9 | -30/+174 |
* | | | | | Merge "Add verbose param to sparse_file_import_auto" | Mohamad Ayyash | 2015-04-01 | 4 | -5/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Add verbose param to sparse_file_import_auto | Mohamad Ayyash | 2015-03-31 | 4 | -5/+6 |
* | | | | | | Merge "Define atrace_* functions for both target and host." | Richard Uhler | 2015-04-01 | 4 | -16/+38 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Define atrace_* functions for both target and host. | Richard Uhler | 2015-03-27 | 4 | -16/+38 |
* | | | | | | Merge "Refactor the code." | Christopher Ferris | 2015-03-31 | 23 | -770/+770 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor the code. | Christopher Ferris | 2015-03-31 | 23 | -770/+770 |
| |/ / / / / | |||||
* | | | | | | Merge "Add -Wno-inline-asm to Clang flags." | Stephen Hines | 2015-03-31 | 2 | -0/+7 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add -Wno-inline-asm to Clang flags. | Stephen Hines | 2015-03-31 | 2 | -0/+7 |
* | | | | | | Merge "run-as: bracket capability" | Mark Salyzyn | 2015-03-31 | 1 | -45/+48 |
|\ \ \ \ \ \ | |||||
| * | | | | | | run-as: bracket capability | Mark Salyzyn | 2015-03-31 | 1 | -45/+48 |
|/ / / / / / | |||||
* | | | | | | Merge "adb: Add option to reboot into sideload mode in recovery" | Tao Bao | 2015-03-31 | 3 | -35/+79 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | adb: Add option to reboot into sideload mode in recovery | Tao Bao | 2015-03-31 | 3 | -35/+79 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge "Build init with clang." | Elliott Hughes | 2015-03-31 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Build init with clang. | Elliott Hughes | 2015-03-30 | 1 | -0/+5 |
|/ / / / / | |||||
* | | | | | Merge "Lose route to toybox." | Elliott Hughes | 2015-03-30 | 2 | -114/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Lose route to toybox. | Elliott Hughes | 2015-03-30 | 2 | -114/+0 |
* | | | | | | Merge "Always unlink /dev/__kmsg__." | Elliott Hughes | 2015-03-30 | 1 | -4/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Always unlink /dev/__kmsg__. | Elliott Hughes | 2015-03-28 | 1 | -4/+1 |
* | | | | | | | Merge "Enable building libbase on Windows." | Dan Albert | 2015-03-30 | 1 | -4/+8 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Enable building libbase on Windows. | Dan Albert | 2015-03-30 | 1 | -4/+8 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)" | Elliott Hughes | 2015-03-30 | 1 | -1/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | toolbox: Fixed type mismatch for ioctl(BLKGETSIZE) | Johan Redestig | 2015-03-30 | 1 | -1/+9 |
|/ / / / / | |||||
* | | | | | Merge "Lose load_policy to toybox." | Elliott Hughes | 2015-03-28 | 2 | -50/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Lose load_policy to toybox. | Elliott Hughes | 2015-03-28 | 2 | -50/+0 |
|/ / / / / | |||||
* | | | | | Merge "Clarify a few things about bootcharts." | Elliott Hughes | 2015-03-28 | 2 | -14/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Clarify a few things about bootcharts. | Elliott Hughes | 2015-03-28 | 2 | -14/+13 |
|/ / / / / | |||||
* | | | | | Merge "Revert "Remove the emulator special case from the "adb root" code."" | Dan Albert | 2015-03-28 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "Remove the emulator special case from the "adb root" code." | Dan Albert | 2015-03-28 | 1 | -0/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge "Further cleanup of the logic in device_init." | Elliott Hughes | 2015-03-28 | 1 | -11/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Further cleanup of the logic in device_init. | Elliott Hughes | 2015-03-28 | 1 | -11/+11 |
|/ / / / / |