summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 5383d4a1: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\
| *-. Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \
| | | * merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | |\ | | |/ / | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | |\ \ | |/ / / | | | _
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-100-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-090-0/+0
| | | |\
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-080-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-040-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-020-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-300-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-240-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-170-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-120-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-030-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * Revert ""Rollback" mimetype cache"Makoto Onuki2012-03-283-51/+4
| | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-080-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\