summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | | | | | | | | | | | \ am ce48083f: Fixes ADB crash on Windows due to large number of connections. d...Vladimir Chtchetkine2011-12-051-15/+190
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ADB crash on Windows due to large number of connections. do not merge.Vladimir Chtchetkine2011-12-051-15/+190
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.ap...Nick Pelly2011-11-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1Nick Pelly2011-11-211-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-211-1/+2