summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Create /data/system/heapdump for system_server"android-wear-5.1.1_r1android-wear-5.1.0_r1Nick Kralevich2015-04-071-0/+1
|\
| * Create /data/system/heapdump for system_serverNick Kralevich2015-04-071-0/+1
|/
* Merge "Lose restorecon to toybox."Elliott Hughes2015-04-072-64/+0
|\
| * Lose restorecon to toybox.Elliott Hughes2015-04-072-64/+0
* | Merge "logd: Don't embed a flexible array member within another struct"Nick Kralevich2015-04-072-5/+17
|\ \ | |/ |/|
| * logd: Don't embed a flexible array member within another structNick Kralevich2015-04-072-5/+17
|/
* Merge "Restore verity state when verified partition is reflashed"Sami Tolvanen2015-04-071-20/+117
|\
| * Restore verity state when verified partition is reflashedSami Tolvanen2015-03-311-20/+117
* | Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-074-37/+44
|\|
| * Set verity mode as the verified property valueSami Tolvanen2015-03-314-37/+44
* | Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"Mark Salyzyn2015-04-061-6/+3
|\ \
| * | android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLSMark Salyzyn2015-04-061-6/+3
|/ /
* | Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."Mark Salyzyn2015-04-061-1/+3
|\ \
| * | Allow inputflinger to have CAP_BLOCK_SUSPEND.Tim Kilbourn2015-04-061-1/+3
|/ /
* | Merge "android_filesystem_config: move fs_config to libcutils"Mark Salyzyn2015-04-062-120/+27
|\ \
| * | android_filesystem_config: move fs_config to libcutilsMark Salyzyn2015-04-062-120/+27
* | | Merge "libcutils: add fs_config"Mark Salyzyn2015-04-062-0/+146
|\| |
| * | libcutils: add fs_configMark Salyzyn2015-04-062-0/+146
* | | Merge "Cleanup base/logging."Dan Albert2015-04-062-40/+26
|\ \ \ | |/ / |/| |
| * | Cleanup base/logging.Dan Albert2015-04-032-40/+26
* | | Merge "Disable CR/LF translation for adb interactive shell."Elliott Hughes2015-04-051-14/+10
|\ \ \
| * | | Disable CR/LF translation for adb interactive shell.Alistair Buxton2015-04-051-14/+10
|/ / /
* | | Merge "Remove execonce."Elliott Hughes2015-04-044-69/+0
|\ \ \
| * | | Remove execonce.Elliott Hughes2015-04-034-69/+0
* | | | Merge "sdcard: Properly handle deleted nodes"Elliott Hughes2015-04-031-1/+19
|\ \ \ \
| * | | | sdcard: Properly handle deleted nodesKrzysztof Adamski2015-02-201-1/+19
* | | | | Merge "Fix "adb devices -l"."Elliott Hughes2015-04-031-17/+14
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix "adb devices -l".Elliott Hughes2015-04-031-17/+14
* | | | | Merge "Support arbitrary loggers."Dan Albert2015-04-034-66/+128
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Support arbitrary loggers.Dan Albert2015-04-034-66/+128
|/ / / /
* | | | Merge "Only Windows doesn't have %zd."Elliott Hughes2015-04-031-5/+5
|\ \ \ \
| * | | | Only Windows doesn't have %zd.Elliott Hughes2015-04-031-5/+5
|/ / / /
* | | | Merge "Share log writing code."Dan Albert2015-04-032-72/+12
|\ \ \ \
| * | | | Share log writing code.Dan Albert2015-04-032-72/+12
* | | | | Merge "Support logging to other log buffers."Dan Albert2015-04-032-34/+66
|\ \ \ \ \
| * | | | | Support logging to other log buffers.Dan Albert2015-04-032-34/+66
|/ / / / /
* | | | | Merge "Remove LogMessage::LogLineLowStack."Dan Albert2015-04-032-48/+0
|\ \ \ \ \
| * | | | | Remove LogMessage::LogLineLowStack.Dan Albert2015-04-022-48/+0
* | | | | | Merge "Don't show lint errors for rvalue references."Dan Albert2015-04-031-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Don't show lint errors for rvalue references.Dan Albert2015-04-021-1/+1
| | |/ / / | |/| | |
* | | | | Merge "Lose umount to toybox."Elliott Hughes2015-04-032-91/+0
|\ \ \ \ \
| * | | | | Lose umount to toybox.Elliott Hughes2015-04-022-91/+0
|/ / / / /
* | | | | Merge "Just use snprintf for android_get_control_socket."Elliott Hughes2015-04-021-19/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Just use snprintf for android_get_control_socket.Elliott Hughes2015-04-021-19/+9
* | | | | Merge "Update the test for better output on error."Christopher Ferris2015-04-021-14/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update the test for better output on error.Christopher Ferris2015-04-021-14/+31
* | | | | Merge "Fix Windows strlcpy.c build."Elliott Hughes2015-04-021-2/+1
|\ \ \ \ \
| * | | | | Fix Windows strlcpy.c build.Elliott Hughes2015-04-021-2/+1
|/ / / / /
* | | | | Merge "Be more intention-revealing with libcutils' strlcpy."Elliott Hughes2015-04-023-21/+9
|\ \ \ \ \
| * | | | | Be more intention-revealing with libcutils' strlcpy.Elliott Hughes2015-04-023-21/+9
|/ / / / /