summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge "Close fd on error path in do_mount()"JP Abgrall2014-11-131-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Close fd on error path in do_mount()Tomasz Kondel2014-11-131-0/+1
| | |/ / / /
* | | | | | Merge "Do not mount devices with invalid verity metadata"Sami Tolvanen2014-11-131-1/+3
|\ \ \ \ \ \
| * | | | | | Do not mount devices with invalid verity metadataSami Tolvanen2014-11-111-1/+3
* | | | | | | Merge "Switch fs_mgr to use SHA-256 instead of SHA-1"Sami Tolvanen2014-11-131-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-111-3/+3
* | | | | | | am 9b5b2d2c: am ca1797ae: Merge "Remove the stlport linked libbacktrace."Dan Albert2014-11-122-71/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am ca1797ae: Merge "Remove the stlport linked libbacktrace."Dan Albert2014-11-122-71/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Remove the stlport linked libbacktrace."Dan Albert2014-11-122-71/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Remove the stlport linked libbacktrace.Dan Albert2014-11-112-71/+1
* | | | | | am 21d8d89c: am 06279285: Merge "Revert "Move some tests to libc++.""Dan Albert2014-11-122-3/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 06279285: Merge "Revert "Move some tests to libc++.""Dan Albert2014-11-122-3/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Revert "Move some tests to libc++.""Dan Albert2014-11-122-3/+2
| | |\ \ \ \
| | | * | | | Revert "Move some tests to libc++."Dan Albert2014-11-112-3/+2
| | |/ / / /
* | | | | | am 4e472966: am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++."Dan Albert2014-11-122-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++."Dan Albert2014-11-122-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Move liblog tests and benchmarks to libc++."Dan Albert2014-11-122-1/+1
| | |\ \ \ \
| | | * | | | Move liblog tests and benchmarks to libc++.Dan Albert2014-11-122-1/+1
| | | |/ / /
* | | | | | am 498c8135: am 7d196df6: Merge "Move some tests to libc++."Dan Albert2014-11-122-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7d196df6: Merge "Move some tests to libc++."Dan Albert2014-11-122-2/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Move some tests to libc++."Dan Albert2014-11-122-2/+3
| | |\ \ \ \
| | | * | | | Move some tests to libc++.Dan Albert2014-11-112-2/+3
| | | |/ / /
* | | | | | fs_mgr: let fsck.f2fs actually attempt a fix automerge: eb6036aJP Abgrall2014-11-121-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-121-1/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-081-1/+2
* | | | | | am 82831c3d: am 4b862563: Merge "property_service: Added vendor build propert...Daniel Rosenberg2014-11-111-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4b862563: Merge "property_service: Added vendor build properties to load_a...Daniel Rosenberg2014-11-111-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "property_service: Added vendor build properties to load_all_props"Daniel Rosenberg2014-11-111-0/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | property_service: Added vendor build properties to load_all_propsDaniel Rosenberg2014-11-111-0/+1
| | |/ / /
* | | | | am 556f4382: am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-112-14/+12
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-112-14/+12
| |\ \ \ | | |/ /
| | * | Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-112-14/+12
| | |\ \
| | | * | kill HAVE_POSIX_FILEMAPYabin Cui2014-11-112-14/+12
| | |/ /
* | | | am 62abd4c8: am b0d30271: Merge "Fix formatting in 4df4dfedf6beef891d05d4e807...Elliott Hughes2014-11-111-1/+2
|\ \ \ \ | |/ / /
| * | | am b0d30271: Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."Elliott Hughes2014-11-101-1/+2
| |\ \ \ | | |/ /
| | * | Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."Elliott Hughes2014-11-101-1/+2
| | |\ \
| | | * | Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885.Elliott Hughes2014-11-101-1/+2
| | |/ /
* | | | am 496fc30d: am af2cd21d: Merge "When new error happend,then errno should be ...Elliott Hughes2014-11-101-1/+2
|\ \ \ \ | |/ / /
| * | | am af2cd21d: Merge "When new error happend,then errno should be updated accor...Elliott Hughes2014-11-101-1/+2
| |\ \ \ | | |/ /
| | * | Merge "When new error happend,then errno should be updated accordingly. Other...Elliott Hughes2014-11-101-1/+2
| | |\ \
| | | * | When new error happend,then errno should be updated accordingly.Bo Huang2014-11-101-1/+2
| | |/ /
* | | | am 25fb460a: am ae52248f: Merge "init isn\'t built for platforms without dire...Elliott Hughes2014-11-101-2/+0
|\ \ \ \ | |/ / /
| * | | am ae52248f: Merge "init isn\'t built for platforms without dirent::d_type."Elliott Hughes2014-11-101-2/+0
| |\ \ \ | | |/ /
| | * | Merge "init isn't built for platforms without dirent::d_type."Elliott Hughes2014-11-101-2/+0
| | |\ \
| | | * | init isn't built for platforms without dirent::d_type.Elliott Hughes2014-11-101-2/+0
| | |/ /
* | | | am b777eacc: am 1da681ca: Merge "bionic\'s struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-6/+6
|\ \ \ \ | |/ / /
| * | | am 1da681ca: Merge "bionic\'s struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-6/+6
| |\ \ \ | | |/ /
| | * | Merge "bionic's struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-6/+6
| | |\ \
| | | * | bionic's struct stat is now POSIX-compliant.Elliott Hughes2014-11-101-6/+6
| | |/ /
* | | | am d6520cf9: am 65a83bdf: Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
|\ \ \ \ | |/ / /