summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-03-26Merge "PicoTTS: Set mNativeSynth prior to TextToSpeechService#onCreate"tools_r22jb-mr1.1-dev-plus-aospNarayan Kamath
2013-03-26PicoTTS: Set mNativeSynth prior to TextToSpeechService#onCreateJorge Ruesga
2012-08-17am 79622ebe: Merge "use LOCAL_PATH properly"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devJoe Onorato
2012-08-16Merge "use LOCAL_PATH properly"tools_r21Joe Onorato
2012-07-21use LOCAL_PATH properlyJoe Onorato
2012-07-13Import translations. DO NOT MERGEYing Wang
2012-06-18Import translations. DO NOT MERGEYing Wang
2012-05-15Merge "Remove obsolete ThirdPartyProject.prop file."Elliott Hughes
2012-05-15Remove obsolete ThirdPartyProject.prop file.Elliott Hughes
2012-05-12am 3c5c83b8: Merge "Restore initialisation of vec38"Andrew Hsieh
2012-05-11Merge "Restore initialisation of vec38"android-sdk-adt_r20tools_r20ics-plus-aospAndrew Hsieh
2012-04-03Merge remote-tracking branch 'goog/ics-aah'android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devMike Lockwood
2012-03-16Add libmedia_nativeandroid-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-releaseGlenn Kasten
2012-02-10am 319ce8db: (-s ours) Import translations. DO NOT MERGEEric Fischer
2012-02-10am 319ce8db: Import translations. DO NOT MERGEEric Fischer
2012-02-08Import translations. DO NOT MERGEandroid-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1ics-mr1-releaseics-mr1Eric Fischer
2012-01-31Restore initialisation of vec38Chris Dearman
2012-01-26Import translations. DO NOT MERGEEric Fischer
2012-01-09Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"Steve Block
2012-01-09Merge "Fix onLoadLanguage, should actually load the language."Narayan Kamath
2012-01-06Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block
2012-01-06Fix onLoadLanguage, should actually load the language.Narayan Kamath
2012-01-04Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block
2011-11-29am 145233c9: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-11-29am 145233c9: Import revised translations. DO NOT MERGEEric Fischer
2011-11-29Import 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-29Import revised translations.Eric Fischer
2011-11-02Merge "Import revised translations."Eric Fischer
2011-11-02am 8e3d9db4: Import revised translations.Eric Fischer
2011-11-02Import revised translations.Eric Fischer
2011-11-01am 8e3d9db4: Import revised translations.Eric Fischer
2011-11-01Import revised translations.Eric Fischer
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
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-26am c659351a: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block
2011-10-25Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block
2011-10-18am 8ff1c4b5: Merge "Import revised translations."Eric Fischer
2011-10-18Merge "Import revised translations."Eric Fischer
2011-10-18Import revised translations.Eric Fischer
2011-10-18am b53127de: (-s ours) am a359cef5: (-s ours) Import revised translations. D...Eric Fischer
2011-10-18am a359cef5: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-18Import 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-09-12Import revised translations.Eric Fischer
2011-08-26Import revised translations.Eric Fischer
2011-08-16Part of effort to remove "failure" messaging to end-users.Claudia de Veaux
2011-07-25Import revised translations.Eric Fischer
2011-07-15Import revised translations.Eric Fischer
2011-07-11Remove the simulator target from all makefiles.Jeff Brown
2011-06-28Merge "Fix a pico bug."Narayan Kamath