summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Switch md5 over to openssl rather than libc.Elliott Hughes2014-06-092-68/+66
* DO NOT MERGE: Revert "delete libnl_2"Colin Cross2014-06-0413-0/+1450
* Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_ST...Andrew Hsieh2014-06-041-0/+8
|\
| * Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIOAndrew Hsieh2014-05-091-0/+8
* | Merge "Fix libcutils/dlmalloc_stubs.c build breakage."Elliott Hughes2014-06-041-1/+0
|\ \
| * | Fix libcutils/dlmalloc_stubs.c build breakage.Elliott Hughes2014-06-031-1/+0
* | | Merge "Fix build."Mathieu Chartier2014-06-041-1/+3
|\ \ \
| * | | Fix build.Mathieu Chartier2014-06-031-1/+3
* | | | Merge "Fix x86 and x86_64 builds."Christopher Ferris2014-06-042-2/+2
|\ \ \ \
| * | | | Fix x86 and x86_64 builds.Christopher Ferris2014-06-032-2/+2
|/ / / /
* | | | Merge "[MIPS64] Build debuggerd for mips64"Elliott Hughes2014-06-031-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [MIPS64] Build debuggerd for mips64Duane Sand2014-06-031-0/+2
* | | | Merge "Fix build."Mathieu Chartier2014-06-031-10/+8
|\ \ \ \
| * | | | Fix build.Mathieu Chartier2014-06-031-10/+8
| | |/ / | |/| |
* | | | Merge "Clean up the debuggerd makefile."Elliott Hughes2014-06-031-16/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Clean up the debuggerd makefile.Elliott Hughes2014-06-031-16/+15
|/ / /
* | | Merge "Make host ashmem_create_region seed only once."Mathieu Chartier2014-06-031-61/+63
|\ \ \
| * | | Make host ashmem_create_region seed only once.Mathieu Chartier2014-06-031-61/+63
* | | | Merge "liblog: test: Send bionc's fatal logging to the crash log"Mark Salyzyn2014-06-031-2/+2
|\ \ \ \
| * | | | liblog: test: Send bionc's fatal logging to the crash logMark Salyzyn2014-06-031-2/+2
|/ / / /
* | | | Merge "Only allow disabling SELinux on userdebug / eng builds"Nick Kralevich2014-06-032-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Only allow disabling SELinux on userdebug / eng buildsNick Kralevich2014-06-022-1/+5
* | | | Merge "Skip the "--abi" flag on "adb install" if present."Narayan Kamath2014-06-031-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Skip the "--abi" flag on "adb install" if present.Narayan Kamath2014-05-291-0/+2
* | | | am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"JP Abgrall2014-06-031-1/+1
|\ \ \ \
| * \ \ \ Merge "libcutils: fix rw FS remount check issue"JP Abgrall2014-06-031-1/+1
| |\ \ \ \
| | * | | | libcutils: fix rw FS remount check issueHong-Mei Li2014-06-021-1/+1
| |/ / / /
* | | | | am bf0f2590: Merge "liblog: cache getuid() syscall"Mark Salyzyn2014-06-021-7/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge "liblog: cache getuid() syscall"Mark Salyzyn2014-06-021-7/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | liblog: cache getuid() syscallMark Salyzyn2014-06-021-7/+10
| |/ / /
* | | | am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."Nick Kralevich2014-05-311-8/+5
|\ \ \ \ | |/ / /
| * | | Merge "SELinux changes to check policy versions during a reload."Nick Kralevich2014-05-311-8/+5
| |\ \ \
| | * | | SELinux changes to check policy versions during a reload.Robert Craig2014-04-281-8/+5
* | | | | am 570cd46d: Merge "Revert "Move libutils to libc++""Dan Albert2014-05-302-4/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Revert "Move libutils to libc++""Dan Albert2014-05-302-4/+9
| |\ \ \ \
| | * | | | Revert "Move libutils to libc++"Dan Albert2014-05-302-4/+9
* | | | | | am 9f69e028: Merge "Move libutils to libc++"Dan Albert2014-05-302-9/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Move libutils to libc++"Dan Albert2014-05-302-9/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Move libutils to libc++Dan Albert2014-05-292-9/+4
| | | |/ / | | |/| |
* | | | | am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"Mark Salyzyn2014-05-291-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "String16.cpp rm unused utils/Debug.h"Mark Salyzyn2014-05-291-1/+0
| |\ \ \ \
| | * | | | String16.cpp rm unused utils/Debug.hMark Salyzyn2014-05-291-1/+0
| |/ / / /
* | | | | am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"Dave Allison2014-05-291-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add LD_PRELOAD for libsigchain.so to the environment"Dave Allison2014-05-291-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add LD_PRELOAD for libsigchain.so to the environmentDave Allison2014-05-151-0/+1
* | | | | am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-281-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-281-1/+2
| |\ \ \ \
| | * | | | Updated trace.h to recognize ATRACE_TAG_BIONIC.Brigid Smith2014-05-271-1/+2
* | | | | | am 811f2c0b: Merge "system/window.h: add deprecation warnings"Mark Salyzyn2014-05-281-1/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "system/window.h: add deprecation warnings"Mark Salyzyn2014-05-281-1/+18
| |\ \ \ \ \