aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge "fastboot: set the language local string"Jean-Baptiste Queru2012-01-272-3/+5
|\
| * fastboot: set the language local stringmgross2012-01-232-3/+5
* | Merge "adb,fastboot: add USB support for Intel Vendor ID"Jean-Baptiste Queru2012-01-242-0/+4
|\|
| * adb,fastboot: add USB support for Intel Vendor IDWu, Hao2012-01-172-0/+4
* | Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb...Jean-Baptiste Queru2012-01-1855-507/+563
|\ \ | |/ |/|
| * Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-172-10/+13
| * Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-1737-174/+183
| * Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-1726-102/+111
| * Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-1715-39/+48
| * Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-1722-131/+140
| * Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-177-36/+45
| * Rename (IF_)LOG() to (IF_)ALOG()Steve Block2012-01-172-29/+37
|/
* Merge "rmmod: fix full path syntax"Jean-Baptiste Queru2012-01-131-0/+2
|\
| * rmmod: fix full path syntaxTanguy Pruvot2012-01-121-0/+2
|/
* rootdir: convert all usages of $prop to ${prop}Dima Zavin2012-01-111-8/+8
* init: use init's property expansion code for setprop/writeDima Zavin2012-01-113-29/+18
* init: delay importing files until after parsing the current fileDima Zavin2012-01-112-20/+51
* init: export all androidboot cmd line values as ro.boot.xx propsDima Zavin2012-01-113-65/+99
* init: import the hardware specific init file in init.rcDima Zavin2012-01-112-2/+2
* init: allow init file imports to use properties in namesDima Zavin2012-01-111-5/+136
* init: initialize property area early at bootDima Zavin2012-01-111-21/+15
* Add ALOG version of LOG_ASSERTSteve Block2012-01-091-0/+1
* Add ALOG versions of LOGD, LOGI, LOGW and LOGESteve Block2011-12-291-0/+12
* Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| |\
* | | am 7cd3e0a3: Document ANativeWindow\'s buffer refcountingJesse Hall2011-12-131-12/+30
|\| |
| * | Document ANativeWindow's buffer refcountingJesse Hall2011-12-121-12/+30
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-120-0/+0
| |\ \ | | |/ | |/|
* | | am b1dfffe6: Fix \'adb backup\' on WindowsChristopher Tate2011-12-091-2/+24
|\| |
| * | Fix 'adb backup' on WindowsChristopher Tate2011-12-091-2/+24
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-050-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | |\
| | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| | | |\
| | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-100-0/+0
| | | | |\
| | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | | | | |\
| | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| | | | | | |\
| | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-010-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-270-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-200-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-120-0/+0
| | | | | | | | | | | | | | | | |\