summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "adb: On Mac, clear both host and device endpoints at startup"android-m-preview-2Siva Velusamy2015-08-131-22/+36
|\
| * adb: On Mac, clear both host and device endpoints at startupSiva Velusamy2015-08-131-22/+36
|/
* Merge "libbase: logging fixes"Elliott Hughes2015-08-132-27/+51
|\
| * libbase: logging fixesSpencer Low2015-08-132-27/+51
* | Merge "Revert "init: add LOCAL_SANITIZE := integer""Nick Kralevich2015-08-131-3/+0
|\ \ | |/ |/|
| * Revert "init: add LOCAL_SANITIZE := integer"Nick Kralevich2015-08-131-3/+0
* | Merge "adb: improve network error info"Elliott Hughes2015-08-134-22/+50
|\ \
| * | adb: improve network error infoSpencer Low2015-08-114-22/+50
* | | Merge "adb: win32: fix shutdown deadlock"Elliott Hughes2015-08-131-12/+15
|\ \ \
| * | | adb: win32: fix shutdown deadlockSpencer Low2015-08-121-12/+15
* | | | Merge "adb: start-server and kill-server error output"Elliott Hughes2015-08-134-7/+44
|\ \ \ \ | |/ / / |/| | |
| * | | adb: start-server and kill-server error outputSpencer Low2015-08-124-7/+44
|/ / /
* | | Merge "Added file permissions for binder tracing"Riley Andrews2015-08-121-0/+11
|\ \ \
| * | | Added file permissions for binder tracingScott Bauer2015-08-121-0/+11
|/ / /
* | | Merge "Added shell permisisons for memreclaim tracing"Riley Andrews2015-08-121-0/+8
|\ \ \
| * | | Added shell permisisons for memreclaim tracingScott Bauer2015-07-161-0/+8
* | | | Merge "adb: Fix PTY logic for non-interactive shells."David Pursell2015-08-123-35/+101
|\ \ \ \
| * | | | adb: Fix PTY logic for non-interactive shells.David Pursell2015-08-123-35/+101
|/ / / /
* | | | Merge "Remove confusing variable HOST."Yabin Cui2015-08-126-49/+39
|\ \ \ \
| * | | | Remove confusing variable HOST.Yabin Cui2015-08-116-49/+39
* | | | | Merge "metricsd: Remove unused Chrome OS specific files."Bertrand Simonnet2015-08-125-137/+0
|\ \ \ \ \
| * | | | | metricsd: Remove unused Chrome OS specific files.Bertrand SIMONNET2015-08-105-137/+0
* | | | | | Merge "metricsd: Relicense as Apache 2."Bertrand Simonnet2015-08-1252-177/+750
|\| | | | |
| * | | | | metricsd: Relicense as Apache 2.Bertrand SIMONNET2015-08-1052-177/+750
* | | | | | Merge "init: add LOCAL_SANITIZE := integer"Nick Kralevich2015-08-121-0/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | init: add LOCAL_SANITIZE := integerNick Kralevich2015-08-111-0/+3
* | | | | | Merge "Always include the adb version in the log."Elliott Hughes2015-08-123-9/+14
|\ \ \ \ \ \
| * | | | | | Always include the adb version in the log.Elliott Hughes2015-08-123-9/+14
|/ / / / / /
* | | | | | Merge "adb: make stdin/stdout/stderr redirection errors fatal"Elliott Hughes2015-08-121-13/+17
|\ \ \ \ \ \
| * | | | | | adb: make stdin/stdout/stderr redirection errors fatalSpencer Low2015-08-121-13/+17
* | | | | | | Merge "healthd: logd: add timestamp to kernel logged battery messages"Mark Salyzyn2015-08-122-5/+39
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | healthd: logd: add timestamp to kernel logged battery messagesMark Salyzyn2015-07-282-5/+39
* | | | | | | Merge "adb: call android::base::InitLogging even when adb tracing is disabled"Elliott Hughes2015-08-111-8/+5
|\ \ \ \ \ \ \
| * | | | | | | adb: call android::base::InitLogging even when adb tracing is disabledSpencer Low2015-08-111-8/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Add missing includes."Dan Albert2015-08-112-3/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add missing includes.Dan Albert2015-08-112-3/+5
* | | | | | | Merge "logd: sizes > 1M prune in smaller batches"Mark Salyzyn2015-08-111-8/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | logd: sizes > 1M prune in smaller batchesMark Salyzyn2015-08-111-8/+15
|/ / / / / /
* | | | | | Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation"Elliott Hughes2015-08-111-122/+284
|\ \ \ \ \ \
| * | | | | | adb: win32: fix USB device hang when resuming from sleep/hibernationSpencer Low2015-08-011-122/+284
* | | | | | | Merge "init: replace strdup() in parse_config()"Tom Cherry2015-08-111-1/+5
|\ \ \ \ \ \ \
| * | | | | | | init: replace strdup() in parse_config()Tom Cherry2015-08-101-1/+5
* | | | | | | | Merge "Ignore adb/*.pyc files"Yusuke Sato2015-08-111-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Ignore adb/*.pyc filesYusuke Sato2015-08-111-0/+1
|/ / / / / / /
* | | | | | | Merge "metricsd: Only define the targets on linux."Bertrand Simonnet2015-08-111-0/+4
|\ \ \ \ \ \ \
| * | | | | | | metricsd: Only define the targets on linux.Bertrand SIMONNET2015-08-111-0/+4
|/ / / / / / /
* | | | | | | Merge "metricsd: Add Android.mk."Bertrand Simonnet2015-08-111-0/+112
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | metricsd: Add Android.mk.Bertrand SIMONNET2015-08-101-0/+112
* | | | | | | Merge "Remove watchprops."Elliott Hughes2015-08-102-93/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove watchprops.Elliott Hughes2015-08-102-93/+0
|/ / / / / / /