summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-02-10am 15fcd332: (-s ours) am d1710cda: am f709f76e: Import translations. DO NOT ...Eric Fischer
2012-02-10am a8ee66f3: (-s ours) am f709f76e: Import translations. DO NOT MERGEEric Fischer
2012-02-10am d1710cda: am f709f76e: Import translations. DO NOT MERGEEric Fischer
2012-02-10am f709f76e: Import translations. DO NOT MERGEEric Fischer
2012-02-10am f709f76e: Import translations. DO NOT MERGEEric Fischer
2012-02-10am f709f76e: Import translations. DO NOT MERGEEric Fischer
2012-02-09Import translations. DO NOT MERGEEric Fischer
2012-02-08Import translations. DO NOT MERGEics-mr1Eric Fischer
2012-02-02merge in jb-release history after reset to masterThe Android Automerger
2012-02-01Merge "Don't force video quality so the user can have choices. Bug: 5733323"Chih-Chung Chang
2012-02-01am e97995eb: am c5694d16: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01am c5694d16: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01Don't force video quality so the user can have choices.Chih-Chung Chang
2012-01-30merge in jb-release history after reset to masterThe Android Automerger
2012-01-26Import translations. DO NOT MERGEEric Fischer
2012-01-02merge in ics-release history after reset to masterThe Android Automerger
2011-12-29Import revised translations.Eric Fischer
2011-12-12am ed26bc9e: Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-12merge in ics-release history after reset to masterThe Android Automerger
2011-12-09Merge "Edits to a few error messages for consistency."Claudia de Veaux
2011-12-09am 56d4303e: (-s ours) am 333cb5dd: Import revised translations. DO NOT MERGEEric Fischer
2011-12-09am 82edd164: Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-09Edits to a few error messages for consistency.Claudia de Veaux
2011-12-09Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-08merge in ics-mr1-release history after reset to ics-mr1android-4.0.3_r1.1android-4.0.3_r1The Android Automerger
2011-12-08am 333cb5dd: Import revised translations. DO NOT MERGEEric Fischer
2011-12-08am 333cb5dd: Import revised translations. DO NOT MERGEEric Fischer
2011-12-08Import 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_r1Eric Fischer
2011-12-08Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-07am 332856ad: Import revised translations. DO NOT MERGEEric Fischer
2011-12-07Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-06merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-12-06am 332856ad: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-12-06Import revised translations. DO NOT MERGEEric Fischer
2011-12-05Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-05merge in ics-release history after reset to masterThe Android Automerger
2011-12-02resolved conflicts for merge of 7704c94e to masterHong Teng
2011-12-02merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-12-02am 7704c94e: Fix for issue 5490443. Add onError implementation for Previewpro...Hong Teng
2011-12-01Fix for issue 5490443.Hong Teng
2011-11-30Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-11-30merge in ics-release history after reset to masterThe Android Automerger
2011-11-30merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-11-29am 6fbfe831: Import revised translations. DO NOT MERGEEric Fischer
2011-11-29am 6fbfe831: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-11-29Import revised translations. DO NOT MERGEEric Fischer
2011-11-29Import revised translations.Eric Fischer
2011-11-18Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-11-17merge in ics-release history after reset to masterThe Android Automerger