summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Download provider change for DRM Forward Lock plugin: to convert .dm f...Gloria Wang2011-06-038-55/+319
|\
| * Download provider change for DRM Forward Lock plugin:Gloria Wang2011-04-198-55/+319
* | Import revised translations.Eric Fischer2011-05-268-0/+478
| |
| \
*-. \ Reconcile with gingerbread-release honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \
| | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |\ \
| | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| |
| | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| |
| | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| |
| | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| |
| | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| |
| | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | |/| |
| | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | |\ \
| | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | | |\ \
| | | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-020-0/+0
| | | | | |\ \
| | | | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-020-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-010-0/+0
| | | | | | | |\ \
| | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-310-0/+0
| | | | | | | |/| |
| | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-300-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-300-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-280-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-280-0/+0
| | | | | | | | | | |/| |
| | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-270-0/+0
| | | | | | | | | | |/| |
| | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-260-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-250-0/+0
| | | | | | | | | | | |/| |
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-240-0/+0
| | | | | | | | | | | |/| |
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-230-0/+0
| | | | | | | | | | | |/| |
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-220-0/+0
| | | | | | | | | | | |/| |
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-210-0/+0
| | | | | | | | | | | |/| |
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-200-0/+0
| | | | | | | | | | | |/| |
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-190-0/+0
| | | | | | | | | | | |/| |
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-180-0/+0
| | | | | | | | | | | |/| |
| | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-170-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-160-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-140-0/+0
| | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-130-0/+0
| | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-120-0/+0
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-110-0/+0
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-110-0/+0
| | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-100-0/+0
| | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | * \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-070-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-060-0/+0
| | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to masterThe Android Automerger2011-01-050-0/+0
| | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to masterThe Android Automerger2011-01-050-0/+0
| | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to masterThe Android Automerger2011-01-040-0/+0
| | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | * | merge in honeycomb-release history after reset to masterThe Android Automerger2010-12-220-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in honeycomb-release history after reset to masterThe Android Automerger2010-12-210-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ Merge branch 'master' into honeycomb-releaseThe Android Automerger2010-12-172-2/+2
| | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | * | Merge branch 'master' into honeycomb-releaseThe Android Automerger2010-12-163-19/+7
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ \ Merge branch 'master' into honeycomb-releaseThe Android Automerger2010-12-157-25/+80
| | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ Merge branch 'master' into honeycomb-releaseThe Android Automerger2010-12-107-31/+207
| | | | | | | | | | | | | | | | | | | | |\ \ \ \