summaryrefslogtreecommitdiffstats
Commit message (Expand)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-247-12/+12
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-02-061-3/+3
| * am fbbdc9f6: Adding high-res live wallpaper picker assetMichael Jurka2012-11-137-1/+1
| |\
| * | Import translations. DO NOT MERGEBaligh Uddin2012-11-091-1/+1
| * | Import translations. DO NOT MERGEBaligh Uddin2012-11-021-1/+1
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-041-1/+1
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-021-1/+1
| * | Import translations. DO NOT MERGEBaligh Uddin2012-09-251-2/+2
| * | am f14b1d2e: Update to follow framework.Dianne Hackborn2012-09-171-0/+4
| |\ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-09-132-3/+3
| * | | am 40db1c1b: Install the permission xml file if LiveWallpapersPicker is insta...Ying Wang2012-08-201-5/+4
| |\ \ \
| * \ \ \ am 19d6fffc: am b6484d3e: Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato2012-08-170-0/+0
| |\ \ \ \
| * | | | | Get rid of LOCAL_MODULE_TAGS := userJoe Onorato2012-07-301-2/+0
* | | | | | Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/pac...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-137-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Adding high-res live wallpaper picker assetMichael Jurka2012-11-137-1/+1
| | |_|_|/ | |/| | |
* | | | | Czech: fixed translationOndrej Zima2013-02-011-3/+3
* | | | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/pa...cm-10.1-M1Steve Kondik2012-11-196-13/+14
|\ \ \ \ \ | |/ / / /
| * | | | Update to follow framework.Dianne Hackborn2012-09-161-0/+4
| | |_|/ | |/| |
| * | | Install the permission xml file if LiveWallpapersPicker is installed.Ying Wang2012-08-201-5/+4
| | |/ | |/|
| * | am b6484d3e: Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato2012-08-171-2/+0
| |\ \ | | |/ | |/|
| | * Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato2012-08-171-2/+0
| | |\
| | | * Get rid of LOCAL_MODULE_TAGS := userJoe Onorato2012-06-141-2/+0
| | |/
| * | Import translations. DO NOT MERGEYing Wang2012-07-121-1/+1
| * | Import translations. DO NOT MERGEYing Wang2012-06-151-2/+2
| * | Import translations. DO NOT MERGEEric Fischer2012-05-251-1/+1
| * | Import translations. DO NOT MERGEEric Fischer2012-05-141-2/+2
| |/
* | LivePicker: Dutch translationsjellybean-stablejellybeanMarco Brohet2012-08-011-22/+19
|/
* Implement issue #4499996: LiveWallpaperPreview activity intent filterDianne Hackborn2012-04-202-2/+99
* 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
| |\
| * \ am ad8535ee: Import revised translations. DO NOT MERGEEric Fischer2011-11-211-5/+5
| |\ \
| * \ \ am a5f145f8: Import revised translations. DO NOT MERGEEric Fischer2011-11-161-1/+1
| |\ \ \
| * \ \ \ am 88804ed2: Import revised translations.Eric Fischer2011-11-012-0/+66
| |\ \ \ \
| * \ \ \ \ 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
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | am ca5d8fc9: (-s ours) am 19ce4d95: (-s ours) Import revised translations. D...Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am eddcde01: Import revised translations.Eric Fischer2011-09-204-8/+4
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am d00d5fc5: (-s ours) am bf7055e3: (-s ours) Import revised translations. D...Eric Fischer2011-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Fix NPE in Live Wallpaper pickerMichael Jurka2012-03-261-0/+4
* | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-121-1/+1
* | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-071-1/+1
* | | | | | | | | | | | am 661ce433: (-s ours) am c82b1824: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am c82b1824: (-s ours) Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-093-5/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-01-261-1/+2
* | | | | | | | | | | Merge "Removing Live Wallpaper Description - Bug 5462731"Justin Ho2012-01-052-22/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removing Live Wallpaper Description - Bug 5462731Leon Hong2011-11-182-22/+0
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |