summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Michael Bestas2014-10-141-0/+26
* Automatic translation importcm-11.0-XNPH44S-bacon-5fa8c79c0bMichael Bestas2014-08-233-4/+4
* Automatic translation importcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aMichael Bestas2014-06-291-0/+26
* Automatic translation importcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaMichael Bestas2014-05-212-0/+52
* Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-0112-4/+271
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-09-1511-1/+271
| * MagicSmoke doesn't actually need BIND_WALLPAPER and SET_WALLPAPER_COMPONENTChristopher Tate2013-06-181-3/+0
* | 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-241-1/+1
|\ \ | |/
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-251-1/+1
* | Czech: added translationcm-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-M2mr1.1-stagingcm-10.1Ondrej Zima2013-02-011-2/+2
|/
* Update to follow framework.cm-10.1-M1Dianne Hackborn2012-09-161-0/+3
* Import translations. DO NOT MERGEjellybean-stablejellybeanEric Fischer2012-04-131-1/+1
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am 75da25a5: Import revised translations.Eric Fischer2011-11-012-0/+56
| |\
| * \ 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 e0c4dd3d: Merge "Import revised translations."Eric Fischer2011-10-181-0/+28
| | |\ \ | | |/ / | |/| |
| | * | am b2e90bea: (-s ours) am 15ae8e5c: (-s ours) Merge "Import revised translati...Eric Fischer2011-10-180-0/+0
| | |\ \
* | | | | Import translations. DO NOT MERGEEric Fischer2012-01-2649-49/+47
* | | | | Merge "Removing Live Wallpaper Description - Bug 5462731"Justin Ho2012-01-0549-104/+55
|\ \ \ \ \
| * | | | | Removing Live Wallpaper Description - Bug 5462731Leon Hong2011-11-1849-104/+55
| |/ / / /
* | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Import revised translations.Eric Fischer2011-11-022-0/+56
| |/ / /
* | | | Import revised translations.ics-releaseicscm-9.1.0Eric Fischer2011-11-012-0/+56
|/ / /
* | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+28
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-10-181-0/+28
| |/
* | am 15ae8e5c: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-10-180-0/+0
|\ \ | |/ |/|
| * Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-181-0/+28
| |\ |/ /
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+28
* | Update MagicSmoke app iconJustin Ho2011-10-174-0/+0
|/
* Apply settings immediately, like other wallpapers.Marco Nelissen2011-10-136-26/+21
* Import revised translations.Eric Fischer2011-08-221-2/+2
* Remove the simulator target from all makefiles.Jeff Brown2011-07-121-4/+0
* Import revised translations.Eric Fischer2011-06-202-0/+56
* Import revised translations.Eric Fischer2011-05-263-0/+84
* Clean up use of rsSetObject/rsClearObject.Stephen Hines2011-05-031-4/+4
* Fix RS graphics samples.Stephen Hines2011-04-281-1/+1
* Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\
| * Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| |\
| | * am 4cb26a82: (-s ours) Import translations for additional languages.Eric Fischer2011-01-250-0/+0
| | |\ | |/ /
* | | am 8d57c787: Fix horizontal and vertical panning.Marco Nelissen2011-01-196-23/+31
|\ \ \ | |/ /
| * | Fix horizontal and vertical panning.Marco Nelissen2011-01-196-23/+31
* | | am f50de7e2: Fix Magic Smoke crash and clarify why we use getPixelsMarco Nelissen2011-01-181-1/+12
|\ \ \ | |/ /
| * | Fix Magic Smoke crash and clarify why we use getPixelsMarco Nelissen2011-01-181-1/+12
* | | am 4cb26a82: (-s ours) Import translations for additional languages.Eric Fischer2011-01-080-0/+0
|\ \ \ | |/ / |/| / | |/
| * Import translations for additional languages.Eric Fischer2011-01-0621-0/+588
* | rendescript api cleanupAlex Sakhartchouk2010-12-221-22/+21
* | Merge "Update for Allocation changes"Jason Sams2010-12-152-3/+8
|\ \
| * | Update for Allocation changesJason Sams2010-12-152-3/+8