Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 0aa45710: am 6a56ad28: Merge "kill HAVE_TERMIO_H" | Yabin Cui | 2014-11-18 | 1 | -12/+17 |
|\ | |||||
| * | 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 83ebca02: am ac252357: Merge "Remove atomic-inline.h." | Elliott Hughes | 2014-11-17 | 3 | -21/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 ba96de5f: am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from s... | Elliott Hughes | 2014-11-17 | 3 | -18/+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 |
| | |/ | |||||
* | | | am 33aacf19: Introduce "adb keygen" automerge: 86c9e5f | Nick Kralevich | 2014-11-17 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Introduce "adb keygen" | Nick Kralevich | 2014-11-17 | 3 | -3/+34 |
| |\ \ | |||||
| | * | | Introduce "adb keygen" | Nick Kralevich | 2014-11-14 | 3 | -3/+34 |
* | | | | am 52b88980: am e11d81b3: Merge "Update calls to IInterface::asBinder()" | Marco Nelissen | 2014-11-17 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 1ef4cf5f: am e90159b0: Merge "Move debuggerd to libc++." | Dan Albert | 2014-11-16 | 1 | -2/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 f6f091a5: am 917d6f4c: Merge "Move libutils to libc++." | Dan Albert | 2014-11-16 | 1 | -4/+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 |
| | |/ / | |||||
* | | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-14 | 1 | -5/+5 |
* | | | | am 9f5f81bf: am 133b7d4a: Merge "Don\'t manually link libgtest_main in libion... | Dan Albert | 2014-11-14 | 1 | -1/+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 a57aacba: am 29a34a5e: Merge "Disable the static libcutils tests." | Dan Albert | 2014-11-14 | 1 | -15/+17 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 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 |
| | | |/ / | |||||
* | | | | | am 0f2966a3: resolve merge conflicts of bc137cf to lmp-mr1-dev-plus-aosp. | Christopher Ferris | 2014-11-14 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 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 |
* | | | | | | Merge "Introduce "adb keygen"" | Nick Kralevich | 2014-11-14 | 3 | -3/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Introduce "adb keygen" | Nick Kralevich | 2014-11-14 | 3 | -3/+34 |
* | | | | | | | am 514eefd5: am a46bf7eb: Merge "Convert futex to cond wait." | Christopher Ferris | 2014-11-14 | 4 | -24/+56 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | 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 28d0d868: am 323df093: Merge "property_service: Added vendor build propert... | Daniel Rosenberg | 2014-11-14 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 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 |
| | | | |_|/ | | | |/| | |