summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 29576ae8: Merge "/vendor is sometimes on a separate partition now."Elliott Hughes2015-02-141-3/+2
|\
| * Merge "/vendor is sometimes on a separate partition now."Elliott Hughes2015-02-141-3/+2
| |\
| | * /vendor is sometimes on a separate partition now.Elliott Hughes2015-02-131-3/+2
| |/
* | am b0572e25: Merge "Remove unused variable BOOTCHART_DEFAULT_TIME_SEC."Elliott Hughes2015-02-141-3/+0
|\ \ | |/
| * Merge "Remove unused variable BOOTCHART_DEFAULT_TIME_SEC."Elliott Hughes2015-02-141-3/+0
| |\
| | * Remove unused variable BOOTCHART_DEFAULT_TIME_SEC.Elliott Hughes2015-02-131-3/+0
| |/
* | am bf7560f1: Merge "Further refactoring of the bootchart code."Elliott Hughes2015-02-145-368/+187
|\ \ | |/
| * Merge "Further refactoring of the bootchart code."Elliott Hughes2015-02-135-368/+187
| |\
| | * Further refactoring of the bootchart code.Elliott Hughes2015-02-135-368/+187
| |/
* | am 265df6f5: Merge "bootchart: fix bootchart can not be triggered problem"Elliott Hughes2015-02-128-111/+107
|\ \ | |/
| * Merge "bootchart: fix bootchart can not be triggered problem"Elliott Hughes2015-02-128-111/+107
| |\
| | * bootchart: fix bootchart can not be triggered problemYongqin Liu2015-02-128-111/+107
* | | am 884f1942: Merge "Do not dump maps/memory/code of sibling threads."Christopher Ferris2015-02-111-43/+39
|\ \ \ | |/ /
| * | Merge "Do not dump maps/memory/code of sibling threads."Christopher Ferris2015-02-111-43/+39
| |\ \
| | * | Do not dump maps/memory/code of sibling threads.Christopher Ferris2015-02-091-43/+39
| | |/
* | | am 05a67c96: Merge "liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark"Mark Salyzyn2015-02-102-5/+5
|\ \ \ | |/ /
| * | Merge "liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark"Mark Salyzyn2015-02-102-5/+5
| |\ \
| | * | liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmarkMark Salyzyn2015-02-102-5/+5
| |/ /
* | | am 0d385d1c: Merge "Track renaming of initUnchangeableSystemProperty."Narayan Kamath2015-02-101-2/+2
|\ \ \ | |/ /
| * | Merge "Track renaming of initUnchangeableSystemProperty."Narayan Kamath2015-02-101-2/+2
| |\ \ | | |/ | |/|
| | * Track renaming of initUnchangeableSystemProperty.Narayan Kamath2015-02-101-2/+2
| |/
* | am ed318bff: Merge "log.h: Fix typo"Andreas Gampe2015-02-101-1/+1
|\ \ | |/
| * Merge "log.h: Fix typo"Andreas Gampe2015-02-101-1/+1
| |\
| | * log.h: Fix typoAndreas Gampe2015-02-091-1/+1
| |/
* | am fd867303: Merge changes I420b5b8a,Ica23fe41Mark Salyzyn2015-02-101-32/+55
|\ \ | |/
| * Merge changes I420b5b8a,Ica23fe41Mark Salyzyn2015-02-091-32/+55
| |\
| | * log.h: wrap android_testLog around __android_log_is_loggableMark Salyzyn2015-02-091-1/+16
| | * log.h: deprecate CONDITIONMark Salyzyn2015-02-091-31/+39
| |/
* | am 830914a4: Merge "Lose touch to toybox."Elliott Hughes2015-02-102-116/+0
|\ \ | |/
| * Merge "Lose touch to toybox."Elliott Hughes2015-02-092-116/+0
| |\
| | * Lose touch to toybox.Elliott Hughes2015-02-092-116/+0
* | | am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"Mark Salyzyn2015-02-105-1/+86
|\ \ \ | |/ /
| * | Merge "liblog: add __android_log_is_loggable()"Mark Salyzyn2015-02-095-1/+86
| |\ \ | | |/ | |/|
| | * liblog: add __android_log_is_loggable()Mark Salyzyn2015-02-095-1/+86
| |/
* | am 3bc8ae63: Merge "Use mkstemp for host ashmem."Elliott Hughes2015-02-101-43/+7
|\ \ | |/
| * Merge "Use mkstemp for host ashmem."Elliott Hughes2015-02-091-43/+7
| |\
| | * Use mkstemp for host ashmem.Elliott Hughes2015-02-091-43/+7
* | | am 3f27558e: Merge "fix bug that passing invalid fd to fstats on win32 builds"Elliott Hughes2015-02-101-1/+1
|\ \ \ | |/ /
| * | Merge "fix bug that passing invalid fd to fstats on win32 builds"Elliott Hughes2015-02-091-1/+1
| |\ \
| | * | fix bug that passing invalid fd to fstats on win32 buildseric.yan2015-02-091-1/+1
| |/ /
* | | am 5ac8b917: Merge "Bump do_write buffer size"Elliott Hughes2015-02-071-1/+1
|\ \ \ | |/ /
| * | Merge "Bump do_write buffer size"Elliott Hughes2015-02-071-1/+1
| |\ \
| | * | Bump do_write buffer sizeJohan Redestig2015-02-071-1/+1
| |/ /
* | | am 317b4024: Revert "Make encryption configurable"Paul Lawrence2015-02-074-8/+4
|\ \ \
| * | | Revert "Make encryption configurable"Paul Lawrence2015-02-064-8/+4
* | | | am c9c401e6: Merge "Move map data into backtrace data proper."Christopher Ferris2015-02-0611-43/+65
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Move map data into backtrace data proper."Christopher Ferris2015-02-0611-43/+65
| |\ \ \ | | |_|/ | |/| |
| | * | Move map data into backtrace data proper.Christopher Ferris2015-02-0611-43/+65
* | | | am 5e753100: Merge "Clean up reading and writing in init."Elliott Hughes2015-02-0614-173/+259
|\ \ \ \ | |/ / /
| * | | Merge "Clean up reading and writing in init."Elliott Hughes2015-02-0614-173/+259
| |\ \ \