summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fastboot: correctly set dependency on f2fs dynamic libJP Abgrall2014-06-181-3/+3
* Only try and use f2fs on linux.Torne (Richard Coles)2014-06-181-1/+1
* Merge "fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)"JP Abgrall2014-06-173-78/+26
|\
| * fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)JP Abgrall2014-06-183-78/+26
* | fastboot: fix windows sdk build (don't do f2fs dyn load on windows)JP Abgrall2014-06-172-10/+17
* | Merge topic 'f2fs'JP Abgrall2014-06-175-31/+111
|\ \ | |/
| * fsmgr: allow for a multiple fs-types for a mount point.JP Abgrall2014-06-173-26/+78
| * F2FS support for fastboot format and fsmgrJP Abgrall2014-06-173-5/+33
* | am d478aec2: am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."Elliott Hughes2014-06-172-29/+13
|\ \ | |/ |/|
| * am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."Elliott Hughes2014-06-172-29/+13
| |\
| | * am 0ef3fa24: Merge "Changed maps output in debuggerd."Elliott Hughes2014-06-172-29/+13
| | |\
| | | * Merge "Changed maps output in debuggerd."Elliott Hughes2014-06-172-29/+13
| | | |\
| | | | * Changed maps output in debuggerd.Brigid Smith2014-06-172-29/+13
| | | |/
* | | | am 6419687f: am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."Elliott Hughes2014-06-171-2/+4
|\ \ \ \ | |/ / /
| * | | am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."Elliott Hughes2014-06-171-2/+4
| |\ \ \ | | |/ /
| | * | am 5bc6b5b8: Merge "Fixed logcat debug output issue."Elliott Hughes2014-06-171-2/+4
| | |\ \ | | | |/
| | | * Merge "Fixed logcat debug output issue."Elliott Hughes2014-06-171-2/+4
| | | |\
| | | | * Fixed logcat debug output issue.Brigid Smith2014-06-171-2/+4
| | | |/
* | | | Merge "Add event log tag for Safety Net."William Luh2014-06-171-0/+2
|\ \ \ \
| * | | | Add event log tag for Safety Net.William Luh2014-06-171-0/+2
* | | | | am 44367492: am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART te...Ian Rogers2014-06-173-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."Ian Rogers2014-06-173-0/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 4dfe6faa: Merge "Enable host multilib for ART testing."Ian Rogers2014-06-173-0/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge "Enable host multilib for ART testing."Ian Rogers2014-06-173-0/+4
| | | |\ \
| | | | * | Enable host multilib for ART testing.Ian Rogers2014-06-173-0/+4
* | | | | | am 545c6599: am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label...Nick Kralevich2014-06-171-3/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink s...Nick Kralevich2014-06-171-3/+4
| |\ \ \ \ | | |/ / /
| | * | | am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in lib...Nick Kralevich2014-06-171-3/+4
| | |\ \ \ | | | |/ /
| | | * | Merge "Extend ueventd to use the label-by-symlink support in libselinux."Nick Kralevich2014-06-171-3/+4
| | | |\ \
| | | | * | Extend ueventd to use the label-by-symlink support in libselinux.Stephen Smalley2014-06-161-3/+4
| | | | |/
* | | | | Merge "fs_mkdirs: use O_NOFOLLOW and O_CLOEXEC"Nick Kralevich2014-06-161-1/+1
|\ \ \ \ \
| * | | | | fs_mkdirs: use O_NOFOLLOW and O_CLOEXECNick Kralevich2014-06-161-1/+1
* | | | | | resolved conflicts for merge of 96021e03 to masterElliott Hughes2014-06-1612-261/+263
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am e3c2e761: am 46a97883: Merge "Changing how debuggerd filters log messages ...Elliott Hughes2014-06-1612-261/+263
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 46a97883: Merge "Changing how debuggerd filters log messages to different ...Elliott Hughes2014-06-1612-261/+263
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Changing how debuggerd filters log messages to different locations."Elliott Hughes2014-06-1612-261/+263
| | | |\ \ \
| | | | * | | Changing how debuggerd filters log messages to different locations.Brigid Smith2014-06-1612-261/+263
* | | | | | | am cd0d5935: am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."Elliott Hughes2014-06-161-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."Elliott Hughes2014-06-161-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 60218f19: Merge "Add gionee USB vendor id."Elliott Hughes2014-06-161-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Add gionee USB vendor id."Elliott Hughes2014-06-161-0/+3
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Add gionee USB vendor id.xuefeng cai2014-06-161-0/+3
| | | |/ / /
* | | | | | Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.Ying Wang2014-06-141-1/+9
| |_|_|_|/ |/| | | |
* | | | | am 9b86360f: am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MIN...Mark Salyzyn2014-06-131-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"Mark Salyzyn2014-06-131-0/+8
| |\ \ \ \ | | |/ / /
| | * | | am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"Mark Salyzyn2014-06-131-0/+8
| | |\ \ \ | | | |/ /
| | | * | Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"Mark Salyzyn2014-06-121-0/+8
| | | |\ \
| | | | * | log: Fix warning with __USE_MINGW_ANSI_STDIODan Willemsen2014-06-121-0/+8
* | | | | | am 46ed1c8c: am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."Dan Albert2014-06-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."Dan Albert2014-06-131-1/+1
| |\ \ \ \ \ | | |/ / / /