summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-16Merge "Get rid of LOCAL_MODULE_TAGS := user"tools_r21Joe Onorato
2012-06-13Get rid of LOCAL_MODULE_TAGS := userJoe Onorato
2012-04-19Implement issue #4499996: LiveWallpaperPreview activity intent filterandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releasejb-devDianne Hackborn
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood
2012-03-26Fix NPE in Live Wallpaper pickerMichael Jurka
2012-03-12Import translations. DO NOT MERGEEric Fischer
2012-03-07Import translations. DO NOT MERGEEric Fischer
2012-02-10am 661ce433: (-s ours) am c82b1824: (-s ours) Import translations. DO NOT MERGEEric Fischer
2012-02-10am c82b1824: (-s ours) Import translations. DO NOT MERGEEric Fischer
2012-02-10am c82b1824: Import translations. DO NOT MERGEEric Fischer
2012-02-08Import translations. DO NOT MERGEandroid-sdk-adt_r20android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1Eric Fischer
2012-01-26Import translations. DO NOT MERGEEric Fischer
2012-01-05Merge "Removing Live Wallpaper Description - Bug 5462731"Justin Ho
2011-12-29Import revised translations.Eric Fischer
2011-11-29Import revised translations.Eric Fischer
2011-11-21am ad8535ee: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-11-21am ad8535ee: Import revised translations. DO NOT MERGEEric Fischer
2011-11-21Import revised translations. DO NOT MERGEandroid-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.3_r1.1android-4.0.3_r1Eric Fischer
2011-11-18Removing Live Wallpaper Description - Bug 5462731Leon Hong
2011-11-17am a5f145f8: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-11-16am a5f145f8: Import revised translations. DO NOT MERGEEric Fischer
2011-11-16Import revised translations. DO NOT MERGEEric Fischer
2011-11-02Merge "Import revised translations."Eric Fischer
2011-11-02Import revised translations.Eric Fischer
2011-11-02am 88804ed2: Import revised translations.Eric Fischer
2011-11-01am 88804ed2: Import revised translations.Eric Fischer
2011-11-01Import revised translations.Eric Fischer
2011-10-31Merge remote branch 'goog/ics-mr1' into ics-aahEd Heyl
2011-10-28Merge "Import revised translations."Eric Fischer
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
2011-10-28Import revised translations.Eric Fischer
2011-10-27am 733d6203: (-s ours) am dec52c7d: (-s ours) Import revised translations. D...Eric Fischer
2011-10-27am dec52c7d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-27Import revised translations. DO NOT MERGEandroid-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseEric Fischer
2011-10-27am 84d00381: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-26Import revised translations. DO NOT MERGEEric Fischer
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-18am ba1eb803: Merge "Import revised translations."Eric Fischer
2011-10-18Merge "Import revised translations."Eric Fischer
2011-10-18Import revised translations.Eric Fischer
2011-10-18am ca5d8fc9: (-s ours) am 19ce4d95: (-s ours) Import revised translations. D...Eric Fischer
2011-10-18am 19ce4d95: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-18Import revised translations. DO NOT MERGEEric Fischer
2011-09-20am eddcde01: Import revised translations.Eric Fischer
2011-09-20Import revised translations.Eric Fischer
2011-09-16am d00d5fc5: (-s ours) am bf7055e3: (-s ours) Import revised translations. D...Eric Fischer
2011-09-16am bf7055e3: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-09-16Import revised translations. DO NOT MERGEEric Fischer
2011-09-12Fix bug 5295767 - Live wallpaper picker needs layout updates for ICSAdam Powell