summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "toolbox: rmmod: fix module unloading"android-sdk-adt_r20Jean-Baptiste Queru2012-06-111-1/+10
|\
| * toolbox: rmmod: fix module unloadingVishal Bhoj2012-05-151-1/+10
* | Merge "Add error handling to SocketClient::sendData"Robert Greenwalt2012-05-301-5/+5
|\ \
| * | Add error handling to SocketClient::sendDataMattias Falk2012-05-291-5/+5
|/ /
* | Merge "toolbox: implement rm -f flag"Jean-Baptiste Queru2012-05-251-13/+40
|\ \ | |/ |/|
| * toolbox: implement rm -f flagTanguy Pruvot2012-05-051-13/+40
* | Merge "adb: usb_windows: fix adb connection lost issue"Jean-Baptiste Queru2012-05-111-3/+3
|\ \
| * | adb: usb_windows: fix adb connection lost issueJack Ren2012-05-091-3/+3
|/ /
* | Merge "init: Fix chown and chmod for write-only files"Jean-Baptiste Queru2012-05-061-2/+13
|\ \ | |/ |/|
| * init: Fix chown and chmod for write-only filesBenoit Goby2012-05-041-2/+13
|/
* Merge "init: make chmod/mkdir/chown not follow symlinks"Nick Kralevich2012-05-021-5/+51
|\
| * init: make chmod/mkdir/chown not follow symlinksGeremy Condra2012-05-021-5/+51
|/
* Merge "Added missing header to window.h"Dima Zavin2012-05-021-0/+1
|\
| * Added missing header to window.hHomin Lee2012-04-201-0/+1
* | Merge "Kindle Fire USB ID"Jean-Baptiste Queru2012-05-021-0/+3
|\ \
| * | Kindle Fire USB IDJon Sawyer2012-04-151-0/+3
| |/
* | Use #define value of 1 to indicate presence of headers.Jeff Brown2012-04-284-8/+8
* | Merge "Restrict zygote to system user."Colin Cross2012-04-271-1/+1
|\ \
| * | Restrict zygote to system user.Nick Kralevich2012-04-271-1/+1
|/ /
* | Merge "init: Add noexec mount option"Colin Cross2012-04-261-0/+1
|\ \
| * | init: Add noexec mount optionLars Svensson2012-04-231-0/+1
| |/
* | Merge "Prevent bit shifting if num bits is negative"Colin Cross2012-04-261-1/+2
|\ \
| * | Prevent bit shifting if num bits is negativeBhanu Chetlapalli2012-01-251-1/+2
* | | Merge from AOSPJean-Baptiste Queru2012-04-241-0/+3
|\ \ \
| * | | type definition for future compat.Eric Laurent2012-04-181-0/+3
| | |/ | |/|
* / | Forward compatibilityJean-Baptiste Queru2012-04-241-1/+2
|/ /
* | am ef3eb5f7: Added rules to build 64-bit libraries: lib64cutils.a and lib64log.aAndrew Hsieh2012-03-222-0/+23
|\ \
| * | Added rules to build 64-bit libraries: lib64cutils.a and lib64log.aAndrew Hsieh2012-03-222-0/+23
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-03-210-0/+0
|\ \ \
| * \ \ merge in ics-mr1-release history after reset to ics-mr1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1The Android Automerger2012-03-100-0/+0
| |\ \ \
| | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-03-090-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-03-080-0/+0
| |\| | |
* | | | | am 5ebced39: init.rc: update the permission of /data/local.Chia-chi Yeh2012-03-081-1/+1
|\| | | |
| * | | | init.rc: update the permission of /data/local.Chia-chi Yeh2012-03-071-1/+1
* | | | | am 9cec99ba: Merge "Fix typo in queue_property_triggers ident"Colin Cross2012-03-021-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Fix typo in queue_property_triggers ident"Colin Cross2012-03-011-1/+1
| |\ \ \ \
| | * | | | Fix typo in queue_property_triggers identChris Dearman2012-03-011-1/+1
| |/ / / /
* | | | | am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"Jean-Baptiste Queru2012-02-281-1/+1
|\| | | |
| * | | | Merge "Toolbox implementation of chown has a bad print"Jean-Baptiste Queru2012-02-281-1/+1
| |\ \ \ \
| | * | | | Toolbox implementation of chown has a bad printJohan Norberg2012-01-201-1/+1
* | | | | | am 13438a93: Merge "logwrapper: reduce verbosity and fix usage"Jean-Baptiste Queru2012-02-281-6/+11
|\| | | | |
| * | | | | Merge "logwrapper: reduce verbosity and fix usage"Jean-Baptiste Queru2012-02-281-6/+11
| |\ \ \ \ \
| | * | | | | logwrapper: reduce verbosity and fix usageTanguy Pruvot2012-02-281-6/+11
| |/ / / / /
* | | | | | am 1ea9fce4: Merge "Extend toolbox with SE Android support."Jean-Baptiste Queru2012-02-2412-8/+616
|\| | | | |
| * | | | | Merge "Extend toolbox with SE Android support."Jean-Baptiste Queru2012-02-2412-8/+616
| |\ \ \ \ \
| | * | | | | Extend toolbox with SE Android support.Stephen Smalley2012-02-0312-8/+616
* | | | | | | am 93553073: Merge "Extend init and ueventd for SE Android."Jean-Baptiste Queru2012-02-248-13/+390
|\| | | | | |
| * | | | | | Merge "Extend init and ueventd for SE Android."Jean-Baptiste Queru2012-02-248-13/+390
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Extend init and ueventd for SE Android.Stephen Smalley2012-02-018-13/+390
| |/ / / / /
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |