summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Introduce "adb keygen""Nick Kralevich2014-11-143-3/+34
|\
| * Introduce "adb keygen"Nick Kralevich2014-11-143-3/+34
* | am 514eefd5: am a46bf7eb: Merge "Convert futex to cond wait."Christopher Ferris2014-11-144-24/+56
|\ \
| * \ am a46bf7eb: Merge "Convert futex to cond wait."Christopher Ferris2014-11-144-24/+56
| |\ \
| | * \ Merge "Convert futex to cond wait."Christopher Ferris2014-11-144-24/+56
| | |\ \
| | | * | Convert futex to cond wait.Christopher Ferris2014-11-144-24/+56
| | |/ /
* | | | am 28d0d868: am 323df093: Merge "property_service: Added vendor build propert...Daniel Rosenberg2014-11-140-0/+0
|\ \ \ \ | |/ / /
| * | | am 323df093: Merge "property_service: Added vendor build properties to load_a...Daniel Rosenberg2014-11-140-0/+0
| |\ \ \
| | * \ \ Merge "property_service: Added vendor build properties to load_all_props" int...Daniel Rosenberg2014-11-141-0/+1
| | |\ \ \
| | | * | | property_service: Added vendor build properties to load_all_propsDaniel Rosenberg2014-11-131-0/+1
* | | | | | am de5fdd67: am 6ef68b55: Merge "System/core: Use memmove"Andreas Gampe2014-11-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6ef68b55: Merge "System/core: Use memmove"Andreas Gampe2014-11-141-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "System/core: Use memmove"Andreas Gampe2014-11-141-1/+1
| | |\ \ \ \
| | | * | | | System/core: Use memmoveAndreas Gampe2014-11-131-1/+1
* | | | | | | am 0b7f3684: am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use s...Hans Boehm2014-11-149-1040/+120
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-11-149-1040/+120
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-11-149-1040/+120
| | |\ \ \ \ \
| | | * | | | | Second attempt to "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-11-139-1040/+120
* | | | | | | | am 99184bab: (-s ours) am 72f0d92c: DO NOT MERGE: Do not mount devices with i...Sami Tolvanen2014-11-140-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-141-1/+3
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-131-1/+3
* | | | | | | | am 2dfadac1: (-s ours) am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-25...Sami Tolvanen2014-11-140-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-141-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-131-3/+3
| | | |_|_|/ / | | |/| | | |
* | | | | | | am 509f1c9a: am 165238d8: Merge "Fix a trivial typo."Chih-Hung Hsieh2014-11-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 165238d8: Merge "Fix a trivial typo."Chih-Hung Hsieh2014-11-131-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Fix a trivial typo."Chih-Hung Hsieh2014-11-131-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix a trivial typo.Chih-Hung Hsieh2014-11-131-1/+1
| | |/ / / / /
* | | | | | | am 30db2d25: am c9582d02: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-143-20/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c9582d02: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
| | |\ \ \ \ \
| | | * | | | | kill HAVE_FORKEXECYabin Cui2014-11-123-20/+18
* | | | | | | | am d56c92b7: am a3f16f22: Merge "Add LOCAL_MULTILIB := both to Darwin libback...Dan Albert2014-11-141-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a3f16f22: Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace."Dan Albert2014-11-131-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace."Dan Albert2014-11-131-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | Add LOCAL_MULTILIB := both to Darwin libbacktrace.Dan Albert2014-11-131-0/+2
| | |/ / / / / /
* | | | | | | | am 8822a81d: am a78e1a74: Merge "Sdcard: Initialize the padding output value"Elliott Hughes2014-11-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a78e1a74: Merge "Sdcard: Initialize the padding output value"Elliott Hughes2014-11-131-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Sdcard: Initialize the padding output value"Elliott Hughes2014-11-131-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | Sdcard: Initialize the padding output valueDaisuke Okitsu2014-11-131-0/+1
| | | | |_|/ / / | | | |/| | | |
* | | | | | | | am 5a8a0162: am 8f7fc8df: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-143-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 8f7fc8df: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-133-6/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-133-6/+6
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | kill HAVE_LOCALTIME_RYabin Cui2014-11-133-6/+6
| | | | |/ / / | | | |/| | |
* | | | | | | am d707b7f9: am b0a10b53: Merge "Fix segfault in get_character_device_symlink...JP Abgrall2014-11-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b0a10b53: Merge "Fix segfault in get_character_device_symlinks()"JP Abgrall2014-11-131-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix segfault in get_character_device_symlinks()"JP Abgrall2014-11-131-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix segfault in get_character_device_symlinks()Tomasz Kondel2014-11-131-1/+1
| | |/ / / / /
* | | | | | | am 755b9099: am c325535d: Merge "Close fd on error path in do_mount()"JP Abgrall2014-11-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c325535d: Merge "Close fd on error path in do_mount()"JP Abgrall2014-11-131-0/+1
| |\ \ \ \ \ \ | | |/ / / / /