summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-07-04Reconcile with jb-releasetools_r21The Android Open Source Project
2012-07-04Remove result ordering for global search.android-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-releaseMark Brophy
2012-07-04am 471522da: Remove result ordering for global search.Mark Brophy
2012-07-04Remove result ordering for global search.android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devMark Brophy
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
2012-04-30merge in jb-release history after reset to jb-devThe Android Automerger
2012-04-26Fix race in ApplicationsProviderBjorn Bringert
2012-04-23merge in jb-release history after reset to masterThe Android Automerger
2012-04-20Update to follow API change.Dianne Hackborn
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood
2012-03-26merge in jb-release history after reset to masterThe Android Automerger
2012-03-23Import translations. DO NOT MERGEEric Fischer
2012-02-01am 0cc3f31e: am 804865e7: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01am 804865e7: Reconcile with ics-mr1-releaseThe Android Open Source Project
2012-02-01Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-09am 5f301c85: Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-12-08Reconcile with ics-mr1-releaseandroid-sdk-adt_r20tools_r20ics-plus-aospThe Android Open Source Project
2011-11-04Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-11-03merge in ics-release history after reset to masterThe Android Automerger
2011-11-02Merge "Import revised translations."Eric Fischer
2011-11-02Import revised translations.Eric Fischer
2011-11-02am c455184b: Import revised translations.Eric Fischer
2011-11-02merge in ics-mr1-release history after reset to ics-mr1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1ics-mr1-releaseThe Android Automerger
2011-11-01am c455184b: Import revised translations.Eric Fischer
2011-11-01Import revised translations.android-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_r1ics-mr1Eric Fischer
2011-10-31Reconcile with ics-mr1-releaseThe Android Open Source Project
2011-10-30merge in ics-release history after reset to masterThe Android Automerger
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-27merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26am 733817a7: (-s ours) am 1b947559: (-s ours) Import revised translations. D...Eric Fischer
2011-10-26am 1b947559: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-26am 2c51ac9c: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-26Import revised translations. DO NOT MERGEEric Fischer
2011-10-26Import 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-26merge in ics-release history after reset to masterThe Android Automerger
2011-10-25am fecfa983: Import revised translations.Eric Fischer
2011-10-25Import revised translations.Eric Fischer
2011-10-20am d6d9fe7d: (-s ours) am 54b8c327: (-s ours) Import revised translations. D...Eric Fischer
2011-10-20am 54b8c327: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-20Import revised translations. DO NOT MERGEEric Fischer
2011-10-18am 15828951: (-s ours) am 3f3a000a: (-s ours) Import revised translations. D...Eric Fischer
2011-10-18am 3f3a000a: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
2011-10-18Import revised translations. DO NOT MERGEEric Fischer
2011-09-13merge in ics-release history after reset to masterThe Android Automerger
2011-09-12Import revised translations.Eric Fischer
2011-08-23merge in ics-release history after reset to masterThe Android Automerger
2011-08-22Import revised translations.Eric Fischer