Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 6a56ad28: Merge "kill HAVE_TERMIO_H" | Yabin Cui | 2014-11-18 | 1 | -12/+17 |
|\ | |||||
| * | Merge "kill HAVE_TERMIO_H" | Yabin Cui | 2014-11-18 | 1 | -12/+17 |
| |\ | |||||
| | * | kill HAVE_TERMIO_H | Yabin Cui | 2014-11-17 | 1 | -12/+17 |
* | | | am ac252357: Merge "Remove atomic-inline.h." | Elliott Hughes | 2014-11-17 | 3 | -21/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge "Remove atomic-inline.h." | Elliott Hughes | 2014-11-17 | 3 | -21/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | Remove atomic-inline.h. | Elliott Hughes | 2014-11-17 | 3 | -21/+2 |
| |/ | |||||
* | | am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core." | Elliott Hughes | 2014-11-17 | 3 | -18/+2 |
|\ \ | |/ | |||||
| * | Merge "Remove the error-prone TARGET_CPU_SMP from system/core." | Elliott Hughes | 2014-11-17 | 3 | -18/+2 |
| |\ | |||||
| | * | Remove the error-prone TARGET_CPU_SMP from system/core. | Elliott Hughes | 2014-11-17 | 3 | -18/+2 |
| |/ | |||||
* | | Introduce "adb keygen" | Nick Kralevich | 2014-11-17 | 3 | -3/+34 |
|\ \ | |||||
| * | | Introduce "adb keygen" | Nick Kralevich | 2014-11-14 | 3 | -3/+34 |
* | | | am e11d81b3: Merge "Update calls to IInterface::asBinder()" | Marco Nelissen | 2014-11-17 | 1 | -5/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge "Update calls to IInterface::asBinder()" | Marco Nelissen | 2014-11-17 | 1 | -5/+5 |
| |\ \ | |||||
| | * | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-17 | 1 | -5/+5 |
| |/ / | |||||
* | | | am e90159b0: Merge "Move debuggerd to libc++." | Dan Albert | 2014-11-16 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge "Move debuggerd to libc++." | Dan Albert | 2014-11-16 | 1 | -2/+0 |
| |\ \ | |||||
| | * | | Move debuggerd to libc++. | Dan Albert | 2014-11-15 | 1 | -2/+0 |
* | | | | am 917d6f4c: Merge "Move libutils to libc++." | Dan Albert | 2014-11-16 | 1 | -4/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Move libutils to libc++." | Dan Albert | 2014-11-16 | 1 | -4/+0 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Move libutils to libc++. | Dan Albert | 2014-11-15 | 1 | -4/+0 |
| |/ / | |||||
* | | | am 133b7d4a: Merge "Don\'t manually link libgtest_main in libion tests." | Dan Albert | 2014-11-14 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge "Don't manually link libgtest_main in libion tests." | Dan Albert | 2014-11-14 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | Don't manually link libgtest_main in libion tests. | Dan Albert | 2014-11-14 | 1 | -1/+0 |
* | | | | am 29a34a5e: Merge "Disable the static libcutils tests." | Dan Albert | 2014-11-14 | 1 | -15/+17 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Disable the static libcutils tests." | Dan Albert | 2014-11-14 | 1 | -15/+17 |
| |\ \ \ | |||||
| | * | | | Disable the static libcutils tests. | Dan Albert | 2014-11-14 | 1 | -15/+17 |
| | |/ / | |||||
* | | | | resolve merge conflicts of bc137cf to lmp-mr1-dev-plus-aosp. | Christopher Ferris | 2014-11-14 | 0 | -0/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge "Convert futex to cond wait." into lmp-mr1-dev | Christopher Ferris | 2014-11-14 | 4 | -24/+60 |
| |\ \ \ | |||||
| | * | | | Convert futex to cond wait. | Christopher Ferris | 2014-11-13 | 4 | -24/+60 |
* | | | | | am a46bf7eb: Merge "Convert futex to cond wait." | Christopher Ferris | 2014-11-14 | 4 | -24/+56 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge "Convert futex to cond wait." | Christopher Ferris | 2014-11-14 | 4 | -24/+56 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Convert futex to cond wait. | Christopher Ferris | 2014-11-14 | 4 | -24/+56 |
| |/ / / | |||||
* | | | | am 323df093: Merge "property_service: Added vendor build properties to load_a... | Daniel Rosenberg | 2014-11-14 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge "property_service: Added vendor build properties to load_all_props" int... | Daniel Rosenberg | 2014-11-14 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | property_service: Added vendor build properties to load_all_props | Daniel Rosenberg | 2014-11-13 | 1 | -0/+1 |
| | | |/ | | |/| | |||||
* | | | | am 6ef68b55: Merge "System/core: Use memmove" | Andreas Gampe | 2014-11-14 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge "System/core: Use memmove" | Andreas Gampe | 2014-11-14 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | System/core: Use memmove | Andreas Gampe | 2014-11-13 | 1 | -1/+1 |
* | | | | | am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h."" | Hans Boehm | 2014-11-14 | 9 | -1040/+120 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h."" | Hans Boehm | 2014-11-14 | 9 | -1040/+120 |
| |\ \ \ \ | |||||
| | * | | | | Second attempt to "Rewrite atomic.h to use stdatomic.h." | Hans Boehm | 2014-11-13 | 9 | -1040/+120 |
* | | | | | | am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadata | Sami Tolvanen | 2014-11-14 | 1 | -1/+3 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | DO NOT MERGE: Do not mount devices with invalid verity metadata | Sami Tolvanen | 2014-11-13 | 1 | -1/+3 |
* | | | | | | am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 | Sami Tolvanen | 2014-11-14 | 1 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 | Sami Tolvanen | 2014-11-13 | 1 | -3/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | am 165238d8: Merge "Fix a trivial typo." | Chih-Hung Hsieh | 2014-11-13 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge "Fix a trivial typo." | Chih-Hung Hsieh | 2014-11-13 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix a trivial typo. | Chih-Hung Hsieh | 2014-11-13 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | am c9582d02: Merge "kill HAVE_FORKEXEC" | Yabin Cui | 2014-11-13 | 3 | -20/+18 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "kill HAVE_FORKEXEC" | Yabin Cui | 2014-11-13 | 3 | -20/+18 |
| |\ \ \ \ |