summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Track rename of base/ to android-base/.Elliott Hughes2015-12-0480-138/+136
* Merge "Add a symlink android-base/ pointing to base/."Elliott Hughes2015-12-041-0/+1
|\
| * Add a symlink android-base/ pointing to base/.Elliott Hughes2015-12-041-0/+1
* | Merge changes Id186dc54,Ie8fee841Bertrand Simonnet2015-12-049-54/+50
|\ \ | |/ |/|
| * metricsd: Allows introspecting the metrics.Bertrand SIMONNET2015-12-046-3/+50
| * metrics: Remove user action logic.Bertrand SIMONNET2015-12-046-52/+1
|/
* Merge "metricsd: Log over binder."Bertrand Simonnet2015-12-0422-1155/+487
|\
| * metricsd: Log over binder.Bertrand SIMONNET2015-12-0322-1155/+487
|/
* Merge changes from topic 'prop-security'Tom Cherry2015-12-032-1/+3
|\
| * Abort if __system_property_area_init failsTom Cherry2015-12-021-1/+2
| * restorecon /property_contextsTom Cherry2015-12-011-0/+1
* | Merge "adbd: split up writes longer than 16k."Josh Gao2015-12-031-38/+22
|\ \
| * | adbd: split up writes longer than 16k.Josh Gao2015-12-031-38/+22
* | | Merge "metricsd: Add clang format config."Bertrand Simonnet2015-12-021-0/+9
|\ \ \
| * | | metricsd: Add clang format config.Bertrand SIMONNET2015-12-021-0/+9
| | |/ | |/|
* | | Merge "adb: don't divide by zero"Josh Gao2015-12-021-4/+17
|\ \ \
| * | | adb: don't divide by zeroJosh Gao2015-11-301-4/+17
* | | | Merge "Fix "adb sync" (and "adb push") error reporting."Elliott Hughes2015-12-024-62/+65
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix "adb sync" (and "adb push") error reporting.Elliott Hughes2015-11-204-62/+65
* | | | Merge changes I25bdcbc5,I12314da5,I055b0821Josh Gao2015-12-011-8/+14
|\ \ \ \
| * | | | adb: don't pull symlinks when pulling a directoryJosh Gao2015-11-301-1/+4
| * | | | adb: remove extraneous newline from skip messageJosh Gao2015-11-301-1/+1
| * | | | adb: correctly count skipped files in push/pullJosh Gao2015-11-301-8/+11
| | |/ / | |/| |
* | | | Merge "liblog: enable windows builds in soong"Dan Willemsen2015-12-011-0/+1
|\ \ \ \
| * | | | liblog: enable windows builds in soongDan Willemsen2015-11-301-0/+1
| | |_|/ | |/| |
* | | | Merge "metricsd: Use different directories for each daemon."Bertrand Simonnet2015-12-0113-66/+101
|\ \ \ \
| * | | | metricsd: Use different directories for each daemon.Bertrand SIMONNET2015-11-3013-66/+101
* | | | | Merge "metricsd: Specify directory for persistent integers."Bertrand Simonnet2015-12-019-92/+63
|\| | | |
| * | | | metricsd: Specify directory for persistent integers.Bertrand SIMONNET2015-11-309-92/+63
| |/ / /
* | | | Merge "Change the way some maps are printed."Christopher Ferris2015-12-012-10/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Change the way some maps are printed.Christopher Ferris2015-11-302-10/+33
|/ / /
* | | Merge "fs_config.c: Remove obsolete reference to /system/bin/pppd-ril"Nick Kralevich2015-11-301-2/+1
|\ \ \ | |/ / |/| |
| * | fs_config.c: Remove obsolete reference to /system/bin/pppd-rilNick Kralevich2015-11-301-2/+1
|/ /
* | Merge "fs_config: remove setuid bit from librank"Nick Kralevich2015-11-301-2/+1
|\ \
| * | fs_config: remove setuid bit from librankNick Kralevich2015-11-271-2/+1
|/ /
* | Merge "crash_reporter: Use cacerts_google"Steve Fung2015-11-241-2/+15
|\ \
| * | crash_reporter: Use cacerts_googleSteve Fung2015-11-231-2/+15
* | | Merge changes I36b66fc5,I0561affbJosh Gao2015-11-241-31/+29
|\ \ \
| * | | libcutils: turn on -Werror on Win32, fix resulting build break.Josh Gao2015-11-241-5/+3
| * | | libcutils: add prefix to local variables in Android.mk.Josh Gao2015-11-241-27/+27
* | | | Merge "Add explicit cast to shut off clang warnings."Chih-hung Hsieh2015-11-241-23/+23
|\ \ \ \
| * | | | Add explicit cast to shut off clang warnings.Chih-Hung Hsieh2015-11-231-23/+23
| | |_|/ | |/| |
* | | | Merge "init: Don't ignore setsockcreatecon errors"Nick Kralevich2015-11-241-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | init: Don't ignore setsockcreatecon errorsNick Kralevich2015-11-231-2/+6
|/ / /
* | | Merge "Move SendLargeFile into SyncConnection."Elliott Hughes2015-11-211-69/+69
|\ \ \ | |/ / |/| |
| * | Move SendLargeFile into SyncConnection.Elliott Hughes2015-11-201-69/+69
|/ /
* | Merge "Add explicit cast to shut off clang warnings."Chih-hung Hsieh2015-11-201-7/+7
|\ \
| * | Add explicit cast to shut off clang warnings.Chih-Hung Hsieh2015-11-201-7/+7
* | | Merge "Avoid SIGPIPE in adb."Elliott Hughes2015-11-203-8/+10
|\ \ \
| * | | Avoid SIGPIPE in adb.Elliott Hughes2015-11-203-8/+10
| | |/ | |/|