Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Track rename of base/ to android-base/. | Elliott Hughes | 2015-12-04 | 80 | -138/+136 |
* | Merge "Add a symlink android-base/ pointing to base/." | Elliott Hughes | 2015-12-04 | 1 | -0/+1 |
|\ | |||||
| * | Add a symlink android-base/ pointing to base/. | Elliott Hughes | 2015-12-04 | 1 | -0/+1 |
* | | Merge changes Id186dc54,Ie8fee841 | Bertrand Simonnet | 2015-12-04 | 9 | -54/+50 |
|\ \ | |/ |/| | |||||
| * | metricsd: Allows introspecting the metrics. | Bertrand SIMONNET | 2015-12-04 | 6 | -3/+50 |
| * | metrics: Remove user action logic. | Bertrand SIMONNET | 2015-12-04 | 6 | -52/+1 |
|/ | |||||
* | Merge "metricsd: Log over binder." | Bertrand Simonnet | 2015-12-04 | 22 | -1155/+487 |
|\ | |||||
| * | metricsd: Log over binder. | Bertrand SIMONNET | 2015-12-03 | 22 | -1155/+487 |
|/ | |||||
* | Merge changes from topic 'prop-security' | Tom Cherry | 2015-12-03 | 2 | -1/+3 |
|\ | |||||
| * | Abort if __system_property_area_init fails | Tom Cherry | 2015-12-02 | 1 | -1/+2 |
| * | restorecon /property_contexts | Tom Cherry | 2015-12-01 | 1 | -0/+1 |
* | | Merge "adbd: split up writes longer than 16k." | Josh Gao | 2015-12-03 | 1 | -38/+22 |
|\ \ | |||||
| * | | adbd: split up writes longer than 16k. | Josh Gao | 2015-12-03 | 1 | -38/+22 |
* | | | Merge "metricsd: Add clang format config." | Bertrand Simonnet | 2015-12-02 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | metricsd: Add clang format config. | Bertrand SIMONNET | 2015-12-02 | 1 | -0/+9 |
| | |/ | |/| | |||||
* | | | Merge "adb: don't divide by zero" | Josh Gao | 2015-12-02 | 1 | -4/+17 |
|\ \ \ | |||||
| * | | | adb: don't divide by zero | Josh Gao | 2015-11-30 | 1 | -4/+17 |
* | | | | Merge "Fix "adb sync" (and "adb push") error reporting." | Elliott Hughes | 2015-12-02 | 4 | -62/+65 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix "adb sync" (and "adb push") error reporting. | Elliott Hughes | 2015-11-20 | 4 | -62/+65 |
* | | | | Merge changes I25bdcbc5,I12314da5,I055b0821 | Josh Gao | 2015-12-01 | 1 | -8/+14 |
|\ \ \ \ | |||||
| * | | | | adb: don't pull symlinks when pulling a directory | Josh Gao | 2015-11-30 | 1 | -1/+4 |
| * | | | | adb: remove extraneous newline from skip message | Josh Gao | 2015-11-30 | 1 | -1/+1 |
| * | | | | adb: correctly count skipped files in push/pull | Josh Gao | 2015-11-30 | 1 | -8/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge "liblog: enable windows builds in soong" | Dan Willemsen | 2015-12-01 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | liblog: enable windows builds in soong | Dan Willemsen | 2015-11-30 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge "metricsd: Use different directories for each daemon." | Bertrand Simonnet | 2015-12-01 | 13 | -66/+101 |
|\ \ \ \ | |||||
| * | | | | metricsd: Use different directories for each daemon. | Bertrand SIMONNET | 2015-11-30 | 13 | -66/+101 |
* | | | | | Merge "metricsd: Specify directory for persistent integers." | Bertrand Simonnet | 2015-12-01 | 9 | -92/+63 |
|\| | | | | |||||
| * | | | | metricsd: Specify directory for persistent integers. | Bertrand SIMONNET | 2015-11-30 | 9 | -92/+63 |
| |/ / / | |||||
* | | | | Merge "Change the way some maps are printed." | Christopher Ferris | 2015-12-01 | 2 | -10/+33 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Change the way some maps are printed. | Christopher Ferris | 2015-11-30 | 2 | -10/+33 |
|/ / / | |||||
* | | | Merge "fs_config.c: Remove obsolete reference to /system/bin/pppd-ril" | Nick Kralevich | 2015-11-30 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | fs_config.c: Remove obsolete reference to /system/bin/pppd-ril | Nick Kralevich | 2015-11-30 | 1 | -2/+1 |
|/ / | |||||
* | | Merge "fs_config: remove setuid bit from librank" | Nick Kralevich | 2015-11-30 | 1 | -2/+1 |
|\ \ | |||||
| * | | fs_config: remove setuid bit from librank | Nick Kralevich | 2015-11-27 | 1 | -2/+1 |
|/ / | |||||
* | | Merge "crash_reporter: Use cacerts_google" | Steve Fung | 2015-11-24 | 1 | -2/+15 |
|\ \ | |||||
| * | | crash_reporter: Use cacerts_google | Steve Fung | 2015-11-23 | 1 | -2/+15 |
* | | | Merge changes I36b66fc5,I0561affb | Josh Gao | 2015-11-24 | 1 | -31/+29 |
|\ \ \ | |||||
| * | | | libcutils: turn on -Werror on Win32, fix resulting build break. | Josh Gao | 2015-11-24 | 1 | -5/+3 |
| * | | | libcutils: add prefix to local variables in Android.mk. | Josh Gao | 2015-11-24 | 1 | -27/+27 |
* | | | | Merge "Add explicit cast to shut off clang warnings." | Chih-hung Hsieh | 2015-11-24 | 1 | -23/+23 |
|\ \ \ \ | |||||
| * | | | | Add explicit cast to shut off clang warnings. | Chih-Hung Hsieh | 2015-11-23 | 1 | -23/+23 |
| | |_|/ | |/| | | |||||
* | | | | Merge "init: Don't ignore setsockcreatecon errors" | Nick Kralevich | 2015-11-24 | 1 | -2/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | init: Don't ignore setsockcreatecon errors | Nick Kralevich | 2015-11-23 | 1 | -2/+6 |
|/ / / | |||||
* | | | Merge "Move SendLargeFile into SyncConnection." | Elliott Hughes | 2015-11-21 | 1 | -69/+69 |
|\ \ \ | |/ / |/| | | |||||
| * | | Move SendLargeFile into SyncConnection. | Elliott Hughes | 2015-11-20 | 1 | -69/+69 |
|/ / | |||||
* | | Merge "Add explicit cast to shut off clang warnings." | Chih-hung Hsieh | 2015-11-20 | 1 | -7/+7 |
|\ \ | |||||
| * | | Add explicit cast to shut off clang warnings. | Chih-Hung Hsieh | 2015-11-20 | 1 | -7/+7 |
* | | | Merge "Avoid SIGPIPE in adb." | Elliott Hughes | 2015-11-20 | 3 | -8/+10 |
|\ \ \ | |||||
| * | | | Avoid SIGPIPE in adb. | Elliott Hughes | 2015-11-20 | 3 | -8/+10 |
| | |/ | |/| |