summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rootdir: convert all usages of $prop to ${prop}Dima Zavin2012-01-101-8/+8
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0837-173/+173
* Merge "Tell the user to unlock/confirm backup & restore operations"Christopher Tate2012-01-061-0/+2
|\
| * Tell the user to unlock/confirm backup & restore operationsChristopher Tate2012-01-061-0/+2
* | Merge changes I3c284860,I06dc35ff,Iedda6c90,I933e5bba,I9205d7d7,Iae9ed109Dima Zavin2012-01-068-118/+297
|\ \ | |/ |/|
| * init: use init's property expansion code for setprop/writeDima Zavin2012-01-053-29/+18
| * init: delay importing files until after parsing the current fileDima Zavin2012-01-052-20/+51
| * init: export all androidboot cmd line values as ro.boot.xx propsDima Zavin2012-01-053-65/+99
| * init: import the hardware specific init file in init.rcDima Zavin2012-01-052-2/+2
| * init: allow init file imports to use properties in namesDima Zavin2012-01-051-5/+136
| * init: initialize property area early at bootDima Zavin2011-12-201-21/+15
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-0526-101/+101
* | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-0415-38/+38
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0322-130/+130
* | am e7e7fac9: (-s ours) Add ALOG versions of LOGD, LOGI, LOGW and LOGESteve Block2011-12-300-0/+0
|\ \ | |/ |/|
| * Add ALOG versions of LOGD, LOGI, LOGW and LOGESteve Block2011-12-291-0/+12
* | am 1b251bde: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ | |/
| * 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
| | |\
* | | \ Merge "Fix the build."Vladimir Chtchetkine2011-12-131-0/+7
|\ \ \ \
| * | | | Fix the build.Vladimir Chtchetkine2011-12-131-0/+7
* | | | | am 3bc5e452: am 7cd3e0a3: Document ANativeWindow\'s buffer refcountingJesse Hall2011-12-131-12/+30
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 7cd3e0a3: Document ANativeWindow\'s buffer refcountingJesse Hall2011-12-131-12/+30
| |\ \ \ | | |/ /
| | * | Document ANativeWindow's buffer refcountingJesse Hall2011-12-121-12/+30
* | | | Merge "Use QEMU pipe for ADB communication when running in emulator."Vladimir Chtchetkine2011-12-131-1/+119
|\ \ \ \
| * | | | Use QEMU pipe for ADB communication when running in emulator.Vladimir Chtchetkine2011-12-131-1/+119
* | | | | Merge "run-as: use mmap to read package list file"Jean-Baptiste Queru2011-12-131-32/+59
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | run-as: use mmap to read package list fileDavid 'Digit' Turner2011-12-061-32/+59
* | | | | am 00eac093: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 650307df: am b1dfffe6: Fix \'adb backup\' on WindowsChristopher Tate2011-12-121-2/+24
|\ \ \ \ \ | |/ / / /
| * | | | am b1dfffe6: Fix \'adb backup\' on WindowsChristopher Tate2011-12-091-2/+24
| |\ \ \ \ | | |/ / /
| | * | | Fix 'adb backup' on WindowsChristopher Tate2011-12-091-2/+24
* | | | | am 336658c3: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge "set mmap_min_addr to 32768"Nick Kralevich2011-12-081-0/+1
|\ \ \ \ \
| * | | | | set mmap_min_addr to 32768Nick Kralevich2011-12-061-0/+1
* | | | | | Merge "Tweak logcat parameters"Christopher Tate2011-12-071-1/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Tweak logcat parametersChristopher Tate2011-12-071-1/+5
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-060-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-050-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | am e64ad60a: (-s ours) am ce48083f: Fixes ADB crash on Windows due to large n...Vladimir Chtchetkine2011-12-050-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
* | | | | Merge "Fixes ADB crash on Windows due to large number of connections."Vladimir Chtchetkine2011-12-031-15/+190
|\ \ \ \ \
| * | | | | Fixes ADB crash on Windows due to large number of connections.Vladimir Chtchetkine2011-12-011-15/+190
* | | | | | Merge "Use strlcpy instead of strncpy"Kenny Root2011-12-011-8/+9
|\ \ \ \ \ \
| * | | | | | Use strlcpy instead of strncpyKenny Root2011-12-011-8/+9
* | | | | | | Merge "Flash cache partition with cache.img by default."Jean-Baptiste Queru2011-12-011-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
generated by cgit v1.1 at 2024-12-25 17:58:30 +0000