summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Fix secondary builds (AOSP, panda) - do not mergeJean-Baptiste Queru2012-05-211-2/+4
* | | | | am 97160be1: (-s ours) DO NOT MERGEMike J. Chen2012-05-170-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | DO NOT MERGEMike J. Chen2012-05-171-33/+134
* | | | | am c6c812ab: (-s ours) DO NOT MERGE:Mike J. Chen2012-05-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGE:Mike J. Chen2012-05-161-134/+33
* | | | | am fc8f4796: (-s ours) DO NOT MERGEDandawate Saket2012-05-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGEDandawate Saket2012-05-041-23/+28
* | | | | am fff80172: 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 jb-release history after reset to jb-devThe Android Automerger2012-05-140-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-080-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-070-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-05-010-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-190-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-110-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-03-290-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ 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-270-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-190-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-130-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-280-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-150-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-020-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 ics-release history after reset to masterThe Android Automerger2012-01-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-050-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-130-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-12-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \