Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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.0 | Michael Bestas | 2014-10-15 | 1 | -0/+26 |
| | | | | Change-Id: I2650189706afd724aafe7a45a2465c85b3daf2b4 | ||||
* | Automatic translation importcm-11.0-XNPH44S-bacon-5fa8c79c0b | Michael Bestas | 2014-08-23 | 3 | -4/+4 |
| | | | | Change-Id: If46ac44329dd29370054f38929939c4029147b26 | ||||
* | Automatic translation importcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505a | Michael Bestas | 2014-06-30 | 1 | -0/+26 |
| | | | | Change-Id: Ic5883455a6806b7239d880fd3179e132bdfbc48c | ||||
* | Automatic translation importcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315ea | Michael Bestas | 2014-05-21 | 2 | -0/+52 |
| | | | | Change-Id: Ifb2bef7bcf40586a1c0ee125ca2cbd424381b8d3 | ||||
* | Merge tag 'android-4.4_r1' into cm-11.0 | Ricardo Cerqueira | 2013-11-01 | 12 | -4/+271 |
|\ | | | | | | | Android 4.4 Release 1.0 | ||||
| * | Import translations. DO NOT MERGE | Baligh Uddin | 2013-09-14 | 11 | -1/+271 |
| | | | | | | | | | | Change-Id: I9ab59fae2172fe3e9516c2cf21010db8277357fa Auto-generated-cl: translation import | ||||
| * | MagicSmoke doesn't actually need BIND_WALLPAPER and SET_WALLPAPER_COMPONENT | Christopher Tate | 2013-06-18 | 1 | -3/+0 |
| | | | | | | | | Change-Id: I95e3666be7a834675f1d30ac89a080ace58dc6ec | ||||
* | | Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2 | Ricardo Cerqueira | 2013-07-25 | 1 | -1/+1 |
|\| | | | | | | | Android 4.3 release 2.1 | ||||
| * | Import translations. DO NOT MERGE | Baligh Uddin | 2012-09-25 | 1 | -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.1 | Ondrej Zima | 2013-02-01 | 1 | -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-M1 | Dianne Hackborn | 2012-09-16 | 1 | -0/+3 |
| | | | | Change-Id: Ib6e54f8843f51ea53859bcb5852befdaa19f0910 | ||||
* | Import translations. DO NOT MERGEjellybean-stablejellybean | Eric Fischer | 2012-04-13 | 1 | -1/+1 |
| | | | | Change-Id: If24a8a2c26a73d6fd258a4455cd377f4f1145e19 | ||||
* | Merge remote-tracking branch 'goog/ics-aah' | Mike Lockwood | 2012-04-03 | 0 | -0/+0 |
|\ | |||||
| * | am 75da25a5: Import revised translations. | Eric Fischer | 2011-11-01 | 2 | -0/+56 |
| |\ | | | | | | | | | | | | | * commit '75da25a50f87692b0cd357698c1dee409a11eb27': Import revised translations. | ||||
| * \ | keep previous history after reset to mr1 plus aah changes (ics-aah-wip) | Ed Heyl | 2011-10-28 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | undo reset to ics-mr1 until we have a better method | Ed Heyl | 2011-10-26 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * | | reset to ics-mr1, but keep history | Ed Heyl | 2011-10-26 | 0 | -0/+0 |
| | |/| | | |/|/ / | |||||
| | * | | am e0c4dd3d: Merge "Import revised translations." | Eric Fischer | 2011-10-18 | 1 | -0/+28 |
| | |\ \ | | |/ / | |/| | | | | | | | | | | * commit 'e0c4dd3d4041d4d226828c13dd8ed184afb12c8c': Import revised translations. | ||||
| | * | | am b2e90bea: (-s ours) am 15ae8e5c: (-s ours) Merge "Import revised ↵ | Eric Fischer | 2011-10-18 | 0 | -0/+0 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE" into ics-mr0 * commit 'b2e90beadf6489dfb7c10164ee1b3213f4d33e6f': Import revised translations. DO NOT MERGE | ||||
* | | | | | Import translations. DO NOT MERGE | Eric Fischer | 2012-01-26 | 49 | -49/+47 |
| | | | | | | | | | | | | | | | | | | | | Change-Id: I556d58c580b59c028010e7395ec622b06609ba14 | ||||
* | | | | | Merge "Removing Live Wallpaper Description - Bug 5462731" | Justin Ho | 2012-01-05 | 49 | -104/+55 |
|\ \ \ \ \ | |||||
| * | | | | | Removing Live Wallpaper Description - Bug 5462731 | Leon Hong | 2011-11-18 | 49 | -104/+55 |
| |/ / / / | | | | | | | | | | | | | | | | Change-Id: I84f3b4ed71bf572061b018e30ead5a1c4ee850ff | ||||
* | | | | | Merge "Import revised translations." | Eric Fischer | 2011-11-02 | 0 | -0/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Import revised translations. | Eric Fischer | 2011-11-02 | 2 | -0/+56 |
| |/ / / | | | | | | | | | | | | | Change-Id: If44a20584d4d9de43061e554382c305b6b79881c | ||||
* / / / | Import revised translations.ics-releaseicscm-9.1.0 | Eric Fischer | 2011-11-01 | 2 | -0/+56 |
|/ / / | | | | | | | | | | Change-Id: I6526c97f70a25e0e4205564680a79a01f67a1773 | ||||
* | | | Merge "Import revised translations." | Eric Fischer | 2011-10-18 | 1 | -0/+28 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Import revised translations. | Eric Fischer | 2011-10-18 | 1 | -0/+28 |
| |/ | | | | | | | Change-Id: I879d31caf469cf502668d8df3fd6b72f59af4e1f | ||||
* | | am 15ae8e5c: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵ | Eric Fischer | 2011-10-18 | 0 | -0/+0 |
|\ \ | |/ |/| | | | | | | | | | into ics-mr0 * commit '15ae8e5c5532e27a1fd5c909cc3a38a4df1d50b0': Import revised translations. DO NOT MERGE | ||||
| * | Merge "Import revised translations. DO NOT MERGE" into ics-mr0 | Eric Fischer | 2011-10-18 | 1 | -0/+28 |
|/| | |||||
| * | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-18 | 1 | -0/+28 |
| | | | | | | | | Change-Id: Ia6c8785f1644f93c1edfe7f98ac3a196c56cc45a | ||||
* | | Update MagicSmoke app icon | Justin Ho | 2011-10-17 | 4 | -0/+0 |
|/ | | | | Change-Id: I6d3e26fdbcd5adc9a4a6c4837d7be44060c1a859 | ||||
* | Apply settings immediately, like other wallpapers. | Marco Nelissen | 2011-10-13 | 6 | -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 Fischer | 2011-08-22 | 1 | -2/+2 |
| | | | | Change-Id: I4180c14b668f10e7d71c273b27839b304476b67e | ||||
* | Remove the simulator target from all makefiles. | Jeff Brown | 2011-07-11 | 1 | -4/+0 |
| | | | | | | Bug: 5010576 Change-Id: I20878bdcb0bfd5f3222d2cad8c6e990ed31246f1 | ||||
* | Import revised translations. | Eric Fischer | 2011-06-20 | 2 | -0/+56 |
| | | | | Change-Id: I44d8b50fadbbed532f095ddc50fd5b46b4d98a08 | ||||
* | Import revised translations. | Eric Fischer | 2011-05-26 | 3 | -0/+84 |
| | | | | Change-Id: I1d314561893ff29007d5921612e087f4ff65df8a | ||||
* | Clean up use of rsSetObject/rsClearObject. | Stephen Hines | 2011-05-02 | 1 | -4/+4 |
| | | | | Change-Id: I5dd679ee759d6321c0111358360dfeb5cbddc9e6 | ||||
* | Fix RS graphics samples. | Stephen Hines | 2011-04-27 | 1 | -1/+1 |
| | | | | Change-Id: I2d7e6029b10135407871a18bf6adfc65c082564f | ||||
* | Reconcile gingerbread-plus-aosp and honeycomb | The Android Open Source Project | 2011-01-30 | 0 | -0/+0 |
|\ | | | | | | | Change-Id: I19629108310359980e81d221b3c5c82fd2025361 | ||||
| * | Mass merge from gingerbread - do not merge | The Android Open Source Project | 2011-01-30 | 0 | -0/+0 |
| |\ | | | | | | | | | | Change-Id: Ic0d8c51f6373169b514a8ff2681d8cf36c92abd6 | ||||
| | * | am 4cb26a82: (-s ours) Import translations for additional languages. | Eric Fischer | 2011-01-25 | 0 | -0/+0 |
| |/| | | | | | | | | | | | | | * commit '4cb26a827ca03cad77522862cc78248e052ea0ca': Import translations for additional languages. | ||||
* | | | am 8d57c787: Fix horizontal and vertical panning. | Marco Nelissen | 2011-01-19 | 6 | -23/+31 |
|\| | | | | | | | | | | | | | | * commit '8d57c78704797dff5df2df2b10a08dec885fe489': Fix horizontal and vertical panning. | ||||
| * | | Fix horizontal and vertical panning. | Marco Nelissen | 2011-01-19 | 6 | -23/+31 |
| | | | | | | | | | | | | Change-Id: I5177f3f3424233371136bdcbf358ce7056ea055d | ||||
* | | | am f50de7e2: Fix Magic Smoke crash and clarify why we use getPixels | Marco Nelissen | 2011-01-18 | 1 | -1/+12 |
|\| | | | | | | | | | | | | | | * commit 'f50de7e2660498d0c606597982639090ac1a8235': Fix Magic Smoke crash and clarify why we use getPixels | ||||
| * | | Fix Magic Smoke crash and clarify why we use getPixels | Marco Nelissen | 2011-01-18 | 1 | -1/+12 |
| | | | | | | | | | | | | Change-Id: Ica61181aedc98d30dc0960387064f253b78177e9 | ||||
* | | | am 4cb26a82: (-s ours) Import translations for additional languages. | Eric Fischer | 2011-01-08 | 0 | -0/+0 |
|\ \ \ | |/ / |/| / | |/ | | | * commit '4cb26a827ca03cad77522862cc78248e052ea0ca': Import translations for additional languages. | ||||
| * | Import translations for additional languages. | Eric Fischer | 2011-01-06 | 21 | -0/+588 |
| | | | | | | | | Change-Id: I16ee85ab44eb607cf1131b799de51295fb16f7bc | ||||
* | | rendescript api cleanup | Alex Sakhartchouk | 2010-12-21 | 1 | -22/+21 |
| | | | | | | | | Change-Id: Ic35a7840518818ee2df0ff00f2d0ee4dacda299c | ||||
* | | Merge "Update for Allocation changes" | Jason Sams | 2010-12-15 | 2 | -3/+8 |
|\ \ | |||||
| * | | Update for Allocation changes | Jason Sams | 2010-12-14 | 2 | -3/+8 |
| | | | | | | | | | | | | Change-Id: I664d96abc4e045962aebe156ac8c143ef474aeef |