summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 58c4a7dd: am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date ...Benoit Goby2014-01-101-1/+1
|\
| * am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /de...Benoit Goby2014-01-101-1/+1
| |\
| | * am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"Benoit Goby2014-01-101-1/+1
| | |\
| | | * am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"Benoit Goby2014-01-091-1/+1
| | | |\
| | | | * Merge "toolbox: Fix date tool with /dev/alarm"Benoit Goby2014-01-101-1/+1
| | | | |\
| | | | | * toolbox: Fix date tool with /dev/alarmBenoit Goby2014-01-091-1/+1
| | | | |/
* | | | | am 7a6e8c9a: am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_...Christopher Ferris2014-01-100-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTR...Christopher Ferris2014-01-104-17/+24
| |\ \ \ \ | | |/ / /
| | * | | am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_T...Christopher Ferris2014-01-104-17/+24
| | |\ \ \ | | | |/ /
| | | * | am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."Christopher Ferris2014-01-094-17/+24
| | | |\ \ | | | | |/
| | | | * Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."Christopher Ferris2014-01-094-17/+24
| | | | |\
| | | | | * Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.Christopher Ferris2014-01-094-17/+24
| | | | |/
* | | | | resolved conflicts for merge of 72256db7 to masterChristopher Ferris2014-01-090-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am c49bd655: am 5d2ec87b: am b18f93ea: Merge "Move CallStack to libbacktrace."Christopher Ferris2014-01-096-123/+36
| |\ \ \ \ | | |/ / /
| | * | | am 5d2ec87b: am b18f93ea: Merge "Move CallStack to libbacktrace."Christopher Ferris2014-01-096-123/+36
| | |\ \ \ | | | |/ /
| | | * | am b18f93ea: Merge "Move CallStack to libbacktrace."Christopher Ferris2014-01-096-123/+36
| | | |\ \ | | | | |/
| | | | * Merge "Move CallStack to libbacktrace."Christopher Ferris2014-01-096-123/+36
| | | | |\
| | | | | * Move CallStack to libbacktrace.Christopher Ferris2014-01-096-123/+36
| | | | |/
* | | | | Merge "liblog: high CPU usage from logcat"Mark Salyzyn2014-01-091-5/+7
|\ \ \ \ \
| * | | | | liblog: high CPU usage from logcatMark Salyzyn2014-01-091-5/+7
* | | | | | am 3fb5ebc5: am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"Colin Cross2014-01-091-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"Colin Cross2014-01-091-0/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am c121c69b: am b0751101: Merge "HP USB ID"Colin Cross2014-01-091-0/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | am b0751101: Merge "HP USB ID"Colin Cross2014-01-091-0/+3
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge "HP USB ID"Colin Cross2014-01-091-0/+3
| | | | |\ \
| | | | | * | HP USB IDJon Sawyer2014-01-081-0/+3
* | | | | | | am 4082bf8c: am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on use...Colin Cross2014-01-091-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | am cd0f824a: Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
| | | | |\ \
| | | | | * | Fix tracing on user buildsCarton He2013-12-051-0/+2
* | | | | | | resolved conflicts for merge of 72f204de to masterChristopher Ferris2014-01-0810-44/+75
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5ca7d87f: am f1f150d0: am 0c863cb5: Merge "Refactor to share map_info amon...Christopher Ferris2014-01-0810-44/+75
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am f1f150d0: am 0c863cb5: Merge "Refactor to share map_info amongst threads."Christopher Ferris2014-01-0810-44/+75
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 0c863cb5: Merge "Refactor to share map_info amongst threads."Christopher Ferris2014-01-0810-44/+75
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "Refactor to share map_info amongst threads."Christopher Ferris2014-01-0810-44/+75
| | | | |\ \ \
| | | | | * | | Refactor to share map_info amongst threads.Christopher Ferris2014-01-0810-44/+75
* | | | | | | | am 218878d4: am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /da...Nick Kralevich2014-01-081-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm f...Nick Kralevich2014-01-081-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."Nick Kralevich2014-01-081-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 8830b53b: Merge "Label existing /data/mediadrm files."Nick Kralevich2014-01-081-0/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Label existing /data/mediadrm files."Nick Kralevich2014-01-081-0/+1
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | | * | | Label existing /data/mediadrm files.rpcraig2014-01-071-0/+1
| | | | |/ / /
* | | | | | | am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* consta...Elliott Hughes2014-01-082-11/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now i...Elliott Hughes2014-01-082-11/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."Elliott Hughes2014-01-082-11/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."Elliott Hughes2014-01-072-11/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."Elliott Hughes2014-01-082-11/+0
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | SWAP_FLAG_* constants are now in <sys/swap.h>.Elliott Hughes2014-01-072-11/+0