summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix build"Paul Lawrence2014-12-041-1/+1
|\
| * Fix buildPaul Lawrence2014-12-041-1/+1
* | Merge "Add adb enable-verity"Paul Lawrence2014-12-046-30/+103
|\ \ | |/
| * Add adb enable-verityPaul Lawrence2014-12-046-30/+103
* | am caaaa278: am 6855af41: Merge "libpixelflinger should #define __ARM_HAVE_NE...Elliott Hughes2014-12-041-0/+1
|\ \
| * \ am 6855af41: Merge "libpixelflinger should #define __ARM_HAVE_NEON."Elliott Hughes2014-12-041-0/+1
| |\ \
| | * \ Merge "libpixelflinger should #define __ARM_HAVE_NEON."Elliott Hughes2014-12-041-0/+1
| | |\ \
| | | * | libpixelflinger should #define __ARM_HAVE_NEON.Elliott Hughes2014-12-031-0/+1
| | |/ /
* | | | am fa969cd1: am 023bc0a4: Merge "Fix deadlocks."Elliott Hughes2014-12-041-3/+3
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am 023bc0a4: Merge "Fix deadlocks."Elliott Hughes2014-12-041-3/+3
| |\ \ | | |/
| | * Merge "Fix deadlocks."Elliott Hughes2014-12-031-3/+3
| | |\
| | | * Fix deadlocks.Bao Haojun2014-05-141-3/+3
* | | | am 96bc6841: am bc260206: Merge "Fix build."Dan Albert2014-11-281-10/+11
|\ \ \ \ | |/ / /
| * | | am bc260206: Merge "Fix build."Dan Albert2014-11-281-10/+11
| |\ \ \ | | |/ /
| | * | Merge "Fix build."Dan Albert2014-11-281-10/+11
| | |\ \
| | | * | Fix build.Dan Albert2014-11-281-10/+11
| | |/ /
* | | | am a03656d8: resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aospElliott Hughes2014-11-272-96/+0
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aospElliott Hughes2014-11-272-96/+0
| |\ \ \ | | |/ /
| | * | Merge "Lose readlink to toybox."Elliott Hughes2014-11-272-96/+0
| | |\ \
| | | * | Lose readlink to toybox.Elliott Hughes2014-11-262-96/+0
* | | | | am fafbd329: am ba1552bd: Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am ba1552bd: Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-271-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-261-1/+1
| | |\ \ \
| | | * | | Clarify the strcmp() with the empty string.Stephen Hines2014-11-261-1/+1
| | |/ / /
* | | | | am 8d49c8b0: am f66486ef: Merge "Fix incorrect path name check."Stephen Hines2014-11-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am f66486ef: Merge "Fix incorrect path name check."Stephen Hines2014-11-271-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix incorrect path name check."Stephen Hines2014-11-261-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix incorrect path name check.Stephen Hines2014-11-261-1/+1
* | | | | am 330d8927: am b553a18a: Merge "Lose dmesg to toybox."Elliott Hughes2014-11-272-59/+0
|\ \ \ \ \ | |/ / / /
| * | | | am b553a18a: Merge "Lose dmesg to toybox."Elliott Hughes2014-11-272-59/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Lose dmesg to toybox."Elliott Hughes2014-11-262-59/+0
| | |\ \ \
| | | * | | Lose dmesg to toybox.Elliott Hughes2014-11-252-59/+0
* | | | | | am be7bb900: am 47f52f24: audio: new stream typesEric Laurent2014-11-261-4/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 47f52f24: audio: new stream typesEric Laurent2014-11-261-4/+8
| |\ \ \ \ \
| | * | | | | audio: new stream typesEric Laurent2014-11-241-4/+8
* | | | | | | am a7ec5f10: am 50ac7725: Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 50ac7725: Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Lose nohup to toybox.Elliott Hughes2014-11-252-27/+0
| | |/ / / /
* | | | | | am bbd3b7ed: am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Only Windows doesn't have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
| | |\ \ \ \
| | | * | | | Only Windows doesn't have <sys/uio.h>.Elliott Hughes2014-11-252-7/+10
| | |/ / / /
* | | | | | am f11758bb: am 9c7e5c7c: Merge "Only Win32 doesn\'t have writev."Elliott Hughes2014-11-251-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9c7e5c7c: Merge "Only Win32 doesn\'t have writev."Elliott Hughes2014-11-251-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Only Win32 doesn't have writev."Elliott Hughes2014-11-251-2/+2
| | |\ \ \ \
| | | * | | | Only Win32 doesn't have writev.Elliott Hughes2014-11-251-2/+2
* | | | | | | am fcb2f0ab: am 0b7e6516: Merge "Libion: Remove unused variables"Andreas Gampe2014-11-252-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0b7e6516: Merge "Libion: Remove unused variables"Andreas Gampe2014-11-252-2/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Libion: Remove unused variables"Andreas Gampe2014-11-252-2/+3
| | |\ \ \ \ \