summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\|
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-240-0/+0
| |\
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-190-0/+0
| | |\
| | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-130-0/+0
| | | |\
| | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-120-0/+0
| | | | |\
| | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-110-0/+0
| | | | | |\
| | | | | | * merge in ics-mr1-release history after reset to ics-mr1android-4.0.3_r1.1android-4.0.3_r1The Android Automerger2011-12-130-0/+0
| | | | | | |\
| | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init.rc: update the permission of /data/local.Chia-chi Yeh2012-03-071-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Add USB vendor IDs for Quanta, INQ and Sony.android-cts-4.0.3_r2Xavier Ducrohet2012-01-242-0/+10
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Add Intel's vendor ID to adbAndrew Hsieh2012-01-181-1/+3
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE" i...Benoit Goby2012-01-131-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGEBenoit Goby2012-01-121-0/+6
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Close a security hole - do not give world readable/writable access to ...James Dong2012-01-111-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close a security hole - do not give world readable/writable access to /data/drmJames Dong2012-01-061-2/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add USB Vendor ID for Fujitsu and Lumigon.Xavier Ducrohet2012-01-111-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from c4f37eed7 in master. Do not merge.Vladimir Chtchetkine2012-01-101-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from c13daef7b on master. Do not merge.Vladimir Chtchetkine2012-01-101-1/+119
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Document ANativeWindow's buffer refcountingandroid-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r1Jesse Hall2011-12-121-12/+30
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / Fix 'adb backup' on WindowsChristopher Tate2011-12-091-2/+24
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / Fixes ADB crash on Windows due to large number of connections. do not merge.Vladimir Chtchetkine2011-12-051-15/+190
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /