summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Return path including executable instead of without"Elliott Hughes2014-11-202-10/+10
|\
| * Return path including executable instead of withoutAl Sutton2014-11-202-10/+10
* | Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
|\ \ | |/ |/|
| * Disable vendor id filtering for Linux.Elliott Hughes2014-11-192-20/+4
|/
* Merge "kill HAVE_PREAD"Yabin Cui2014-11-201-2/+2
|\
| * kill HAVE_PREADYabin Cui2014-11-191-2/+2
|/
* Merge "logd: throttle SELinux denials to 20/sec"Nick Kralevich2014-11-193-22/+13
|\
| * logd: throttle SELinux denials to 20/secNick Kralevich2014-11-193-22/+13
* | Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-192-15/+16
|\ \ | |/ |/|
| * Fix building on modern versions of Xcode and OS X.Al Sutton2014-11-192-15/+16
|/
* Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+6
|\
| * kill HAVE_MADVISEYabin Cui2014-11-191-2/+6
|/
* Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+2
|\
| * kill HAVE_MADVISEYabin Cui2014-11-181-2/+2
|/
* Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
|\
| * Revert "adb: Add USB vendor ID for Honeywell"Elliott Hughes2014-11-181-3/+0
* | Merge "toolbox: enable mkswap to work on block devices"Elliott Hughes2014-11-181-41/+39
|\ \
| * | toolbox: enable mkswap to work on block devicesAndrew Boie2014-11-181-41/+39
|/ /
* | Merge "toolbox: indicate why swap{on|off} failed"Elliott Hughes2014-11-182-2/+2
|\ \
| * | toolbox: indicate why swap{on|off} failedAndrew Boie2014-04-302-2/+2
* | | Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
|\ \ \
| * | | kill HAVE_TERMIO_HYabin Cui2014-11-171-12/+17
* | | | Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Remove atomic-inline.h.Elliott Hughes2014-11-173-21/+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
|/ / /
* | | Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-171-5/+5
|\ \ \
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-5/+5
|/ / /
* | | Merge "Move debuggerd to libc++."Dan Albert2014-11-161-2/+0
|\ \ \
| * | | Move debuggerd to libc++.Dan Albert2014-11-151-2/+0
* | | | Merge "Move libutils to libc++."Dan Albert2014-11-161-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Move libutils to libc++.Dan Albert2014-11-151-4/+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
* | | | Merge "Disable the static libcutils tests."Dan Albert2014-11-141-15/+17
|\ \ \ \
| * | | | Disable the static libcutils tests.Dan Albert2014-11-141-15/+17
| |/ / /
* | | | Merge "Convert futex to cond wait."Christopher Ferris2014-11-144-24/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Convert futex to cond wait.Christopher Ferris2014-11-144-24/+56
|/ / /
* | | Merge "System/core: Use memmove"Andreas Gampe2014-11-141-1/+1
|\ \ \
| * | | System/core: Use memmoveAndreas Gampe2014-11-131-1/+1
* | | | 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
* | | | | Merge "Fix a trivial typo."Chih-Hung Hsieh2014-11-131-1/+1
|\ \ \ \ \
| * | | | | Fix a trivial typo.Chih-Hung Hsieh2014-11-131-1/+1
|/ / / / /
* | | | | Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
|\ \ \ \ \
| * | | | | kill HAVE_FORKEXECYabin Cui2014-11-123-20/+18
* | | | | | 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
|/ / / / / /
* | | | | | Merge "Sdcard: Initialize the padding output value"Elliott Hughes2014-11-131-0/+1
|\ \ \ \ \ \
| * | | | | | Sdcard: Initialize the padding output valueDaisuke Okitsu2014-11-131-0/+1
| | |/ / / / | |/| | | |