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-257-12/+12
|\ | | | | | | Android 4.3 release 2.1
| * Import translations. DO NOT MERGEBaligh Uddin2013-02-061-3/+3
| | | | | | | | | | Change-Id: Icbd1e600c64f817b564c34f9580b075252f83306 Auto-generated-cl: translation import
| * am fbbdc9f6: Adding high-res live wallpaper picker assetMichael Jurka2012-11-137-1/+1
| |\ | | | | | | | | | | | | * commit 'fbbdc9f61cea305cbba3830bad6397bf2ffb7587': Adding high-res live wallpaper picker asset
| * | Import translations. DO NOT MERGEBaligh Uddin2012-11-091-1/+1
| | | | | | | | | | | | | | | Change-Id: I0c54dce444ac253ae31765a94a67423e97d57e1b Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2012-11-011-1/+1
| | | | | | | | | | | | | | | Change-Id: I6716710f09d0696657292d3f723d330edd9fe8ac Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-031-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie76eef14f1f7e96ee695a3a29f3a9e31c187398e Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-021-1/+1
| | | | | | | | | | | | | | | Change-Id: Ifa09d3727f3e4d12f502ddd9cd958e74d514f493 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEBaligh Uddin2012-09-251-2/+2
| | | | | | | | | | | | | | | Change-Id: If3bff094cdf9a7c734a9379f855207d8a13e5525 Auto-generated-cl: translation import
| * | am f14b1d2e: Update to follow framework.Dianne Hackborn2012-09-171-0/+4
| |\ \ | | | | | | | | | | | | | | | | * commit 'f14b1d2e17ee862b84c9acb88f299984c6e969d9': Update to follow framework.
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-09-132-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I911a7bf3d49a191ce6d937081f7e0d97396999bd Auto-generated-cl: translation import
| * | | am 40db1c1b: Install the permission xml file if LiveWallpapersPicker is ↵Ying Wang2012-08-201-5/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed. * commit '40db1c1b930f1d816ecc56f39445843eb72b4642': Install the permission xml file if LiveWallpapersPicker is installed.
| * \ \ \ am 19d6fffc: am b6484d3e: Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato2012-08-170-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '19d6fffc67cdabb5a7bc5341e696515a05fe97ab': Get rid of LOCAL_MODULE_TAGS := user
| * | | | | Get rid of LOCAL_MODULE_TAGS := userJoe Onorato2012-07-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I03d7dad3333b58709b8ba594d2bb44ca85462c54
* | | | | | Merge tag 'android-4.2.2_r1' of ↵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-M2mr1.1-stagingcm-10.1Steve Kondik2013-02-127-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/wallpapers/LivePicker into 1.1 Android 4.2.2 release 1
| * | | | | Adding high-res live wallpaper picker assetMichael Jurka2012-11-137-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Bug: 7400295 Change-Id: I919388c69b828c6464f57acf59c1cf6f6e6a9c85
* | | | | Czech: fixed translationOndrej Zima2013-02-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge from GB. Change-Id: I107c8414929734fd82d1b14352445cca610b52b7
* | | | | Merge branch 'jb-mr1-release' of ↵cm-10.1-M1Steve Kondik2012-11-186-13/+14
|\| | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/wallpapers/LivePicker into HEAD
| * | | | Update to follow framework.Dianne Hackborn2012-09-161-0/+4
| | |_|/ | |/| | | | | | | | | | Change-Id: I38c6e59234432b103a619dbf5dab0b1fd029f101
| * | | Install the permission xml file if LiveWallpapersPicker is installed.Ying Wang2012-08-201-5/+4
| | |/ | |/| | | | | | | | | | Bug: 7019907 Change-Id: I75ee7df305e9e4f2ff0f8816d77ed7344a6db1ab
| * | am b6484d3e: Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato2012-08-171-2/+0
| |\ \ | | |/ | |/| | | | | | | * commit 'b6484d3e816812bf1fac83b7606a9a590a846226': Get rid of LOCAL_MODULE_TAGS := user
| | * Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato2012-08-161-2/+0
| | |\
| | | * Get rid of LOCAL_MODULE_TAGS := userJoe Onorato2012-06-131-2/+0
| | |/ | | | | | | | | | Change-Id: I03d7dad3333b58709b8ba594d2bb44ca85462c54
| * | Import translations. DO NOT MERGEYing Wang2012-07-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I19ddbd20086ecc524f6e1103c2368c4d74afea0d Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEYing Wang2012-06-151-2/+2
| | | | | | | | | | | | Change-Id: Ib32bae9ab70c9c496beb5584b56edb4e6f5b9d8d
| * | Import translations. DO NOT MERGEEric Fischer2012-05-251-1/+1
| | | | | | | | | | | | Change-Id: Iecf458bf4f6d7e2ac2a42dfd4aa0577151906d15
| * | Import translations. DO NOT MERGEEric Fischer2012-05-141-2/+2
| |/ | | | | | | Change-Id: I127e2a18ac6b41b48cf214691914c17ec4ce9d63
* / LivePicker: Dutch translationsjellybean-stablejellybeanMarco Brohet2012-08-011-22/+19
|/ | | | Change-Id: I0b9d4ba13afaaf24a10229edc29fe60efdf7c813
* Implement issue #4499996: LiveWallpaperPreview activity intent filterDianne Hackborn2012-04-192-2/+99
| | | | Change-Id: If717ce64157356e470b198fb74ff8bab96d3f4ba
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am c82b1824: Import translations. DO NOT MERGEEric Fischer2012-02-103-5/+6
| |\ | | | | | | | | | | | | * commit 'c82b1824cb6a9a809818155059c1daf275ac94f1': Import translations. DO NOT MERGE
| * \ am ad8535ee: Import revised translations. DO NOT MERGEEric Fischer2011-11-211-5/+5
| |\ \ | | | | | | | | | | | | | | | | * commit 'ad8535ee889d92348da3faa63dcd5ea097952dd9': Import revised translations. DO NOT MERGE
| * \ \ am a5f145f8: Import revised translations. DO NOT MERGEEric Fischer2011-11-161-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'a5f145f8bd42a1f3013aa208448f9d5373b0ad1c': Import revised translations. DO NOT MERGE
| * \ \ \ am 88804ed2: Import revised translations.Eric Fischer2011-11-012-0/+66
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '88804ed2e45ca5b735f75f85b57ff0d3c0c92f34': Import revised translations.
| * \ \ \ \ Merge remote branch 'goog/ics-mr1' into ics-aahEd Heyl2011-10-310-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ 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 ba1eb803: Merge "Import revised translations."Eric Fischer2011-10-182-1/+34
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba1eb80306f21f285313a0abdaa9e8f87fa265c0': Import revised translations.
| | * | | | | | | am ca5d8fc9: (-s ours) am 19ce4d95: (-s ours) Import revised translations. ↵Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit 'ca5d8fc918e3ecdf5777a6843786f401b0c21d8f': Import revised translations. DO NOT MERGE
| | * \ \ \ \ \ \ \ am eddcde01: Import revised translations.Eric Fischer2011-09-204-8/+4
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eddcde014ba046be6be4011c24d9d31639c23fcf': Import revised translations.
| | * \ \ \ \ \ \ \ \ am d00d5fc5: (-s ours) am bf7055e3: (-s ours) Import revised translations. ↵Eric Fischer2011-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit 'd00d5fc5eb097b83baff1692c1193c07f2803481': Import revised translations. DO NOT MERGE
* | | | | | | | | | | | Fix NPE in Live Wallpaper pickerMichael Jurka2012-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5913040 Change-Id: Ic8e975ca1a9b9712509c6e9b31d55be2111e36a1
* | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f453cb0b33c865e8a6f7ba33bef0bb4f633bcf0
* | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1608b36b5f3c28ee2d4bc70b69e1a25d333dc36a
* | | | | | | | | | | | am 661ce433: (-s ours) am c82b1824: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '661ce433ed93042ba20eb07339f3dd974dd76f43': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ am c82b1824: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | * commit 'c82b1824cb6a9a809818155059c1daf275ac94f1': Import translations. DO NOT MERGE
| | * | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-083-5/+6
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e33f917b7ec5f4a2cbc327657d6c2a9daf665e7
* | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I387bfd593636e6b94aeedefb3ccd9405909d331a
* | | | | | | | | | | Merge "Removing Live Wallpaper Description - Bug 5462731"Justin Ho2012-01-052-22/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removing Live Wallpaper Description - Bug 5462731Leon Hong2011-11-182-22/+0
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If8d4ed443590576ffd203054f1f5b7ee26adb7cf
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 08:42:50 +0000