summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | | | | | Import revised translations.Eric Fischer2011-12-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide9e35b93ecc6647ac713b6189f13aaed2241870
* | | | | | | | | | | Import revised translations.Eric Fischer2011-11-292-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I947f7b695cbbefd5f570130864a57a34d714dd63
* | | | | | | | | | | am ad8535ee: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad8535ee889d92348da3faa63dcd5ea097952dd9': Import revised translations. DO NOT MERGE
| * | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-211-5/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe79b5b82506dc10d2caddff54f1df41168d1324
* | | | | | | | | | am a5f145f8: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5f145f8bd42a1f3013aa208448f9d5373b0ad1c': Import revised translations. DO NOT MERGE
| * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-161-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I428c051affb1ef34d6badb8786490a36a5e93e85
* | | | | | | | | Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import revised translations.Eric Fischer2011-11-022-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I626d2f24dc527576261b4728b12b07ee66b2d14d
* | | | | | | | | | am 88804ed2: Import revised translations.Eric Fischer2011-11-022-0/+66
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | | | | | | | | | * commit '88804ed2e45ca5b735f75f85b57ff0d3c0c92f34': Import revised translations.
| * | | | | | | / Import revised translations.Eric Fischer2011-11-012-0/+66
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I1401e3fb425130283a6a70b125ae631fad078cb4
* | | | | | | | Merge "Import revised translations."Eric Fischer2011-10-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Import revised translations.Eric Fischer2011-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24b24a4c19b847c6c6ff9d8c5fe8e0a6692caf05
* | | | | | | | | am 733d6203: (-s ours) am dec52c7d: (-s ours) Import revised translations. ↵Eric Fischer2011-10-270-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '733d62038c07e7aa20f1e7c8d09449f99a004e71': Import revised translations. DO NOT MERGE
| * | | | | | | am dec52c7d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-270-0/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'dec52c7db31bdab5fcc5b7676c167638fe99bb92': Import revised translations. DO NOT MERGE
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a46ef54cb8c2632857d240a1b470f7621d5e492
* | | | | | | | am 84d00381: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-270-0/+0
|\| | | | | | | | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | * commit '84d00381039c7f8d140bcc9cdc9da7a223d68a9f': Import revised translations. DO NOT MERGE
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-261-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I026e46d44067affeb2bdc1812b000af2ba31aa36
* | | | | | Merge "Import revised translations."Eric Fischer2011-10-182-1/+34
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Import revised translations.Eric Fischer2011-10-182-1/+34
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: I664819d1b8af08d36528e6fb9dea91cac552333e
* | | | | am 19ce4d95: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '19ce4d957845025defcdfa295b3b7954abf5f84c': Import revised translations. DO NOT MERGE
| * / / Import revised translations. DO NOT MERGEEric Fischer2011-10-182-1/+34
|/ / / | | | | | | | | | Change-Id: I9fbb09250c54dddd9217ada16f5905d664918791
* | / Import revised translations.Eric Fischer2011-09-204-8/+4
| |/ |/| | | | | Change-Id: Iffd0340a3f66629287e760552ab2e851883598a4
* | am bf7055e3: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-160-0/+0
|\ \ | |/ |/| | | | | * commit 'bf7055e32d336e012b1eea806ffacf5109f90db9': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-164-8/+4
|/ | | | Change-Id: I32fb7bad94c5be483d7be184ab6b1e3a7330d363
* Fix bug 5295767 - Live wallpaper picker needs layout updates for ICSAdam Powell2011-09-121-11/+15
| | | | | | Obey new button ordering, use button bar styling Change-Id: I067cb231f1f45d7b3bc864f667b894a7649d4d1f
* Import revised translations.Eric Fischer2011-08-261-1/+1
| | | | Change-Id: I517b3a74901cbba7f79c251b8e2df56909714667