summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Restrict the list of acceptable prerequisitesJean-Baptiste Queru2012-02-031-2/+2
* Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-250-0/+0
| |\ |/ /
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-180-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-mr1The Android Automerger2012-01-060-0/+0
| | | |\
| | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| | | | |\
| | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-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-170-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-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-060-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-030-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-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-310-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-mr1-release history after reset to ics-mr1The Android Automerger2011-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-230-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-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-040-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-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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Merge remote branch 'origin/master' into ics-releaseThe Android Automerger2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\