summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 6a56ad28: Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
|\
| * Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
| |\
| | * kill HAVE_TERMIO_HYabin Cui2014-11-171-12/+17
* | | am ac252357: Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
|\ \ \ | |/ /
| * | Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
| |\ \ | | |/ | |/|
| | * Remove atomic-inline.h.Elliott Hughes2014-11-173-21/+2
| |/
* | am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."Elliott Hughes2014-11-173-18/+2
|\ \ | |/
| * Merge "Remove the error-prone TARGET_CPU_SMP from system/core."Elliott Hughes2014-11-173-18/+2
| |\
| | * Remove the error-prone TARGET_CPU_SMP from system/core.Elliott Hughes2014-11-173-18/+2
| |/
* | Introduce "adb keygen"Nick Kralevich2014-11-173-3/+34
|\ \
| * | Introduce "adb keygen"Nick Kralevich2014-11-143-3/+34
* | | am e11d81b3: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-171-5/+5
|\ \ \ | | |/ | |/|
| * | Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-171-5/+5
| |\ \
| | * | Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-5/+5
| |/ /
* | | am e90159b0: Merge "Move debuggerd to libc++."Dan Albert2014-11-161-2/+0
|\ \ \ | |/ /
| * | Merge "Move debuggerd to libc++."Dan Albert2014-11-161-2/+0
| |\ \
| | * | Move debuggerd to libc++.Dan Albert2014-11-151-2/+0
* | | | am 917d6f4c: Merge "Move libutils to libc++."Dan Albert2014-11-161-4/+0
|\ \ \ \ | |/ / /
| * | | Merge "Move libutils to libc++."Dan Albert2014-11-161-4/+0
| |\ \ \ | | |/ / | |/| |
| | * | Move libutils to libc++.Dan Albert2014-11-151-4/+0
| |/ /
* | | am 133b7d4a: Merge "Don\'t manually link libgtest_main in libion tests."Dan Albert2014-11-141-1/+0
|\ \ \ | |/ /
| * | Merge "Don't manually link libgtest_main in libion tests."Dan Albert2014-11-141-1/+0
| |\ \
| | * | Don't manually link libgtest_main in libion tests.Dan Albert2014-11-141-1/+0
* | | | am 29a34a5e: Merge "Disable the static libcutils tests."Dan Albert2014-11-141-15/+17
|\ \ \ \ | |/ / /
| * | | Merge "Disable the static libcutils tests."Dan Albert2014-11-141-15/+17
| |\ \ \
| | * | | Disable the static libcutils tests.Dan Albert2014-11-141-15/+17
| | |/ /
* | | | resolve merge conflicts of bc137cf to lmp-mr1-dev-plus-aosp.Christopher Ferris2014-11-140-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Convert futex to cond wait." into lmp-mr1-devChristopher Ferris2014-11-144-24/+60
| |\ \ \
| | * | | Convert futex to cond wait.Christopher Ferris2014-11-134-24/+60
* | | | | 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 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 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 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 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 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 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 c9582d02: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
| |\ \ \ \