summaryrefslogtreecommitdiffstats
Commit message (Collapse)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-251-1/+1
|\ | | | | | | Android 4.3 release 2.1
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-251-1/+1
| | | | | | | | | | Change-Id: I789cb6d059c6430231dbf19d3ded22ccfb59c66b Auto-generated-cl: translation import
* | 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
|/ | | | | | | Merge from GB patch #2 - slight correction, hope the Cid do his work better Change-Id: I441e83e998241b44c41f80619e60ef74ca9db2b9
* Update to follow framework.cm-10.1-M1Dianne Hackborn2012-09-161-0/+3
| | | | Change-Id: Ib6e54f8843f51ea53859bcb5852befdaa19f0910
* Import translations. DO NOT MERGEjellybean-stablejellybeanEric Fischer2012-04-131-1/+1
| | | | Change-Id: If24a8a2c26a73d6fd258a4455cd377f4f1145e19
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am 75da25a5: Import revised translations.Eric Fischer2011-11-012-0/+56
| |\ | | | | | | | | | | | | * commit '75da25a50f87692b0cd357698c1dee409a11eb27': Import revised translations.
| * \ 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
| | |\ \ | | |/ / | |/| | | | | | | | | | * commit 'e0c4dd3d4041d4d226828c13dd8ed184afb12c8c': Import revised translations.
| | * | am b2e90bea: (-s ours) am 15ae8e5c: (-s ours) Merge "Import revised ↵Eric Fischer2011-10-180-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE" into ics-mr0 * commit 'b2e90beadf6489dfb7c10164ee1b3213f4d33e6f': Import revised translations. DO NOT MERGE
* | | | | Import translations. DO NOT MERGEEric Fischer2012-01-2649-49/+47
| | | | | | | | | | | | | | | | | | | | Change-Id: I556d58c580b59c028010e7395ec622b06609ba14
* | | | | Merge "Removing Live Wallpaper Description - Bug 5462731"Justin Ho2012-01-0549-104/+55
|\ \ \ \ \
| * | | | | Removing Live Wallpaper Description - Bug 5462731Leon Hong2011-11-1849-104/+55
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I84f3b4ed71bf572061b018e30ead5a1c4ee850ff
* | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Import revised translations.Eric Fischer2011-11-022-0/+56
| |/ / / | | | | | | | | | | | | Change-Id: If44a20584d4d9de43061e554382c305b6b79881c
* / / / Import revised translations.ics-releaseicscm-9.1.0Eric Fischer2011-11-012-0/+56
|/ / / | | | | | | | | | Change-Id: I6526c97f70a25e0e4205564680a79a01f67a1773
* | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+28
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-10-181-0/+28
| |/ | | | | | | Change-Id: I879d31caf469cf502668d8df3fd6b72f59af4e1f
* | am 15ae8e5c: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-180-0/+0
|\ \ | |/ |/| | | | | | | | | into ics-mr0 * commit '15ae8e5c5532e27a1fd5c909cc3a38a4df1d50b0': Import revised translations. DO NOT MERGE
| * 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
| | | | | | | | Change-Id: Ia6c8785f1644f93c1edfe7f98ac3a196c56cc45a
* | Update MagicSmoke app iconJustin Ho2011-10-174-0/+0
|/ | | | Change-Id: I6d3e26fdbcd5adc9a4a6c4837d7be44060c1a859
* Apply settings immediately, like other wallpapers.Marco Nelissen2011-10-136-26/+21
| | | | | | | | | | Don't have an explicit "OK" button to apply the current preset, but just apply it immediately, like other wallpapers with settings do. Also use a different default setting that is more in line with the overall ICS theme, and update the thumbnail accordingly. b/5288769 Change-Id: Ibe35b74c3d5c9ad35708b98007d9bb0a396a25c2
* Import revised translations.Eric Fischer2011-08-221-2/+2
| | | | Change-Id: I4180c14b668f10e7d71c273b27839b304476b67e
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-4/+0
| | | | | | Bug: 5010576 Change-Id: I20878bdcb0bfd5f3222d2cad8c6e990ed31246f1
* Import revised translations.Eric Fischer2011-06-202-0/+56
| | | | Change-Id: I44d8b50fadbbed532f095ddc50fd5b46b4d98a08
* Import revised translations.Eric Fischer2011-05-263-0/+84
| | | | Change-Id: I1d314561893ff29007d5921612e087f4ff65df8a
* Clean up use of rsSetObject/rsClearObject.Stephen Hines2011-05-021-4/+4
| | | | Change-Id: I5dd679ee759d6321c0111358360dfeb5cbddc9e6
* Fix RS graphics samples.Stephen Hines2011-04-271-1/+1
| | | | Change-Id: I2d7e6029b10135407871a18bf6adfc65c082564f
* Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ | | | | | | Change-Id: I19629108310359980e81d221b3c5c82fd2025361
| * Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| |\ | | | | | | | | | Change-Id: Ic0d8c51f6373169b514a8ff2681d8cf36c92abd6
| | * am 4cb26a82: (-s ours) Import translations for additional languages.Eric Fischer2011-01-250-0/+0
| |/| | | | | | | | | | | | | * commit '4cb26a827ca03cad77522862cc78248e052ea0ca': Import translations for additional languages.
* | | am 8d57c787: Fix horizontal and vertical panning.Marco Nelissen2011-01-196-23/+31
|\| | | | | | | | | | | | | | * commit '8d57c78704797dff5df2df2b10a08dec885fe489': Fix horizontal and vertical panning.
| * | Fix horizontal and vertical panning.Marco Nelissen2011-01-196-23/+31
| | | | | | | | | | | | Change-Id: I5177f3f3424233371136bdcbf358ce7056ea055d
* | | am f50de7e2: Fix Magic Smoke crash and clarify why we use getPixelsMarco Nelissen2011-01-181-1/+12
|\| | | | | | | | | | | | | | * commit 'f50de7e2660498d0c606597982639090ac1a8235': Fix Magic Smoke crash and clarify why we use getPixels
| * | Fix Magic Smoke crash and clarify why we use getPixelsMarco Nelissen2011-01-181-1/+12
| | | | | | | | | | | | Change-Id: Ica61181aedc98d30dc0960387064f253b78177e9
* | | am 4cb26a82: (-s ours) Import translations for additional languages.Eric Fischer2011-01-080-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '4cb26a827ca03cad77522862cc78248e052ea0ca': Import translations for additional languages.
| * Import translations for additional languages.Eric Fischer2011-01-0621-0/+588
| | | | | | | | Change-Id: I16ee85ab44eb607cf1131b799de51295fb16f7bc
* | rendescript api cleanupAlex Sakhartchouk2010-12-211-22/+21
| | | | | | | | Change-Id: Ic35a7840518818ee2df0ff00f2d0ee4dacda299c
* | Merge "Update for Allocation changes"Jason Sams2010-12-152-3/+8
|\ \
| * | Update for Allocation changesJason Sams2010-12-142-3/+8
| | | | | | | | | | | | Change-Id: I664d96abc4e045962aebe156ac8c143ef474aeef
* | | Add Context to a RenderScript or RenderScriptGL instance.Shih-wei Liao2010-12-091-1/+1
|/ / | | | | | | | | | | | | This is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. Change-Id: I33b759db49706f0cecba689f021f66d1b80666b0
* | Unbreak magic smoke.Jason Sams2010-12-071-2/+2
| | | | | | | | Change-Id: I599f7d62603506de91a986b5e470c946b01afca8
* | API updateJason Sams2010-12-063-17/+8
| | | | | | | | Change-Id: Idf4ea56d40f51d9964b86deb4670c618e681ba4c
* | Rename Indonesian and Hebrew translations to match Locale.java conventionsEric Fischer2010-12-022-0/+0
| | | | | | | | Change-Id: Ia2816d2c5d16cd179967656be8d2d81c8d27edc2
* | Merge "Remove unnecessary export_func pragma."Stephen Hines2010-11-181-2/+0
|\ \
| * | Remove unnecessary export_func pragma.Stephen Hines2010-11-181-2/+0
| | | | | | | | | | | | Change-Id: Ib121cfb1168f901d13cfddefc4196a9351fd939f
* | | Merge "Import initial translations for 20 new locales."Eric Fischer2010-11-1820-0/+560
|\ \ \ | |/ / |/| |