summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-252-3/+5
|\
| * Update for API 18Jason Sams2013-02-051-1/+3
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-021-2/+2
|/
* Merge remote-tracking branch 'goog/ics-aah'cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingjellybean-stablejellybeancm-10.1Mike Lockwood2012-04-030-0/+0
|\
| * am d816c1b9: Import revised translations. DO NOT MERGEEric Fischer2011-11-211-1/+1
| |\
| * \ am ebd5f4de: Import revised translations.Eric Fischer2011-11-012-0/+44
| |\ \
| * \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \
| | * \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \
| | | * | | reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |/| | | | |/|/ / /
| | * | | am a4552352: Import revised translations.Eric Fischer2011-10-251-2/+2
| | |\ \ \
| | * \ \ \ am 4e42527c: (-s ours) am 787a95a8: (-s ours) Import revised translations. D...Eric Fischer2011-10-210-0/+0
| | |\ \ \ \
| | * \ \ \ \ am f77b4224: Merge "Import revised translations."Eric Fischer2011-10-181-0/+22
| | |\ \ \ \ \
| | * \ \ \ \ \ am cd2d40dd: (-s ours) am 4c580173: (-s ours) Import revised translations. D...Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 8208dfce: Import revised translations.Eric Fischer2011-09-3045-0/+990
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 4c813fa4: (-s ours) am 5ccc9479: (-s ours) Import revised translations. D...Eric Fischer2011-09-270-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 525414ba: (-s ours) am 375201f4: (-s ours) Import revised translations. DO...Eric Fischer2011-09-260-0/+0
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 414eac95: (-s ours) am cae13125: (-s ours) Import revised translations. D...Eric Fischer2011-09-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Import revised translations.Eric Fischer2011-11-291-1/+1
* | | | | | | | | | | | | am d816c1b9: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-211-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import revised translations.Eric Fischer2011-11-022-0/+44
* | | | | | | | | | | | | am ebd5f4de: Import revised translations.Eric Fischer2011-11-022-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * / / / / / / / / / / Import revised translations.Eric Fischer2011-11-012-0/+44
| |/ / / / / / / / / /
* | | | | | | | | | / am 7b04c17d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
|\| | | | | | | | | | | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-261-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* / | | | | | | | Import revised translations.Eric Fischer2011-10-251-2/+2
|/ / / / / / / /
* | | | | | | | am 787a95a8: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-210-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-211-2/+2
* | | | | | | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Import revised translations.Eric Fischer2011-10-181-0/+22
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 4c580173: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * / / / / Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+22
|/ / / / /
* | | | / Import revised translations.Eric Fischer2011-09-3045-0/+990
| |_|_|/ |/| | |
* | | | am 5ccc9479: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-270-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-09-271-1/+1
* | | | am 375201f4: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-260-0/+0
|\| | | | |_|/ |/| |
| * | Import revised translations. DO NOT MERGEEric Fischer2011-09-265-0/+110
* | | am cae13125: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-230-0/+0
|\| | | |/ |/|
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-2340-0/+880
|/
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-4/+0
* Fix RS graphics samples.Stephen Hines2011-05-021-1/+1
* Alter colors for holo spiral wallpaperAdam Powell2011-01-313-4/+4
* renderscript api cleanupAlex Sakhartchouk2010-12-211-10/+11
* Changed package nameAdam Lesinski2010-12-161-1/+1
* Remove unnecessary uploads.Jason Sams2010-12-161-1/+0
* Merge "Update for Allocation API changes."Jason Sams2010-12-151-2/+1
|\
| * Update for Allocation API changes.Jason Sams2010-12-141-2/+1
* | Add Context to a RenderScript or RenderScriptGL instance.Shih-wei Liao2010-12-091-1/+1
|/
* API updateJason Sams2010-12-063-19/+14