summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-11-29Merge "Ignore "disconnected" broadcast when voice dial is done"Daisuke Miyakawa
2011-11-29Import revised translations.Eric Fischer
Change-Id: Icdf5aa193fd9fa6c981d977baa54dcf09be1f1dc
2011-11-28Ignore "disconnected" broadcast when voice dial is doneDaisuke Miyakawa
We currently show error message about "disconnected" status even after voice recognition was successful. This change ignores the event when appropriate. Bug: 5386457 Change-Id: Ie11e43c3dfd0cec718a8a2db0d51560b909d864e
2011-11-21am 0d78fc40: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit '0d78fc40857027c7c01b13002191ae0e0be98500': Import revised translations. DO NOT MERGE
2011-11-21am 0d78fc40: Import revised translations. DO NOT MERGEEric Fischer
* commit '0d78fc40857027c7c01b13002191ae0e0be98500': Import revised translations. DO NOT MERGE
2011-11-21Import revised translations. DO NOT MERGEEric Fischer
Change-Id: Ida58af297e32e82288e593587838ee928c6309c6
2011-11-17am bc64e2eb: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer
into ics-mr1 * commit 'bc64e2eb5407d4aa94f8cf1b1e5e48d1eb65a4dc': Import revised translations. DO NOT MERGE
2011-11-17am 946d1158: am 77abe8bd: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project
* commit '946d115867dacca1f8ec59fed10091c80e8cf728':
2011-11-16am bc64e2eb: Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer
* commit 'bc64e2eb5407d4aa94f8cf1b1e5e48d1eb65a4dc': Import revised translations. DO NOT MERGE
2011-11-16Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer
2011-11-16Import revised translations. DO NOT MERGEEric Fischer
Change-Id: I650833d9f6571a2463e2ea6bfcbe5404b014bc01
2011-11-16am 946d1158: am 77abe8bd: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project
* commit '946d115867dacca1f8ec59fed10091c80e8cf728':
2011-11-16am 77abe8bd: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project
* commit '77abe8bdf4f88594e3a042dd563736d61d2b44a5':
2011-11-16Reconcile with ics-factoryrom-2-releaseandroid-sdk-adt_r16.0.1android-cts-4.0_r1ics-mr0The Android Open Source Project
Change-Id: I98da1431300159df84adf6d9f3b362b9d803d900
2011-11-10Import revised translations.Eric Fischer
Change-Id: If52df7b10c93aa05baf180de5618e8765b0e145b
2011-11-07Merge "Edit to text strings to meet UI text standards. e.g., we don't say ↵Claudia de Veaux
"please" or use "failure" anymore. Bugs: 5165745, 5163232, 5162668"
2011-11-04am 7d03d950: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project
* commit '7d03d9508d71de88d32e2f72d9c6ee1526da6c24': Re-introduce workaround for issue 3090362
2011-11-04am 7d03d950: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project
* commit '7d03d9508d71de88d32e2f72d9c6ee1526da6c24': Re-introduce workaround for issue 3090362
2011-11-04Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project
Change-Id: I6c8b792d984e628ddcd80a62876612fec2546c1d
2011-11-04am 6082880a: am 13a75ecb: Re-introduce workaround for issue 3090362Daisuke Miyakawa
* commit '6082880a0e71b01f14b4606cdbe9b9311014e450': Re-introduce workaround for issue 3090362
2011-11-04am 6082880a: am 13a75ecb: Re-introduce workaround for issue 3090362Daisuke Miyakawa
* commit '6082880a0e71b01f14b4606cdbe9b9311014e450': Re-introduce workaround for issue 3090362
2011-11-04am 13a75ecb: Re-introduce workaround for issue 3090362Daisuke Miyakawa
* commit '13a75ecbb8d8f6b4658dff832133d0fba574d62f': Re-introduce workaround for issue 3090362
2011-11-03Re-introduce workaround for issue 3090362android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-factoryrom-2-releaseDaisuke Miyakawa
This is originally I790da2e1ad1a37130ceaa2bd6cdb7cd779a5925c, which happened to be ignored during auto-merge. Bug: 5508989 Change-Id: Ida37ad9d0edf05538fdd9506571c0661463394d6
2011-11-03Edit to text strings to meet UI text standards.Claudia de Veaux
e.g., we don't say "please" or use "failure" anymore. Bugs: 5165745, 5163232, 5162668 Change-Id: I45f5ec2af48f62d26dacbacf1606cd19201206f7
2011-11-03Re-introduce workaround for issue 3090362android-4.0.2_r1ics-mr0-releaseDaisuke Miyakawa
This is originally I790da2e1ad1a37130ceaa2bd6cdb7cd779a5925c, which happened to be ignored during auto-merge. Bug: 5508989 Change-Id: Ida37ad9d0edf05538fdd9506571c0661463394d6
2011-11-02Merge "Import revised translations."Eric Fischer
2011-11-02Import revised translations.Eric Fischer
Change-Id: Idabc89aba5dfbc71ed4d3f725461b2d0431d0f29
2011-11-02am 6ce61943: Import revised translations.Eric Fischer
* commit '6ce6194384b6ebf2dc264f61289d740b82dd65e2': Import revised translations.
2011-11-01am 6ce61943: Import revised translations.Eric Fischer
* commit '6ce6194384b6ebf2dc264f61289d740b82dd65e2': Import revised translations.
2011-11-01Import revised translations.Eric Fischer
Change-Id: Ib681b04af871e71484036afbb1edf7fa9c05d985
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
2011-10-28Import revised translations.Eric Fischer
Change-Id: I7989e39e920b127e93cf7204ce433a38eac5bcd5
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26am 22f9511c: (-s ours) am 02fa41b5: (-s ours) Import revised translations. ↵Eric Fischer
DO NOT MERGE * commit '22f9511c74003bdcf3bb13adea8306fbb771f6f7': Import revised translations. DO NOT MERGE
2011-10-26am 02fa41b5: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit '02fa41b5f4cdd024e1528cd7ca5a103de3212718': Import revised translations. DO NOT MERGE
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-26am 4349746a: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit '4349746a462926ffa496ed98e138c00c28912430': Import revised translations. DO NOT MERGE
2011-10-26Import revised translations. DO NOT MERGEEric Fischer
Change-Id: I0574e7bba7e52ef73bc9b45d6a1b64ae4dd33d59
2011-10-26Import revised translations. DO NOT MERGEEric Fischer
Change-Id: I36e3716947f1ef45ec9be5c7e0e091f1344b1215
2011-10-25am b0acab76: Import revised translations.Eric Fischer
* commit 'b0acab761912010f4f4286f960f51cb9cc0f09a4': Import revised translations.
2011-10-25Import revised translations.Eric Fischer
Change-Id: Ice2c26cd8d935bbc9f087aae8066da11d6421657
2011-10-21am b34c04df: (-s ours) am 4c165fe6: (-s ours) Import revised translations. ↵Eric Fischer
DO NOT MERGE * commit 'b34c04df74ee7d6c76ddc134a1560a030b4dc0b7': Import revised translations. DO NOT MERGE
2011-10-21am 4c165fe6: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit '4c165fe66d439efe4850214f78730c400c47f292': Import revised translations. DO NOT MERGE
2011-10-21Import revised translations. DO NOT MERGEEric Fischer
Change-Id: I383401199ccba41a21631a8cc12895a3abf7c2ab
2011-10-18am 6e1f4ca1: Merge "Import revised translations."Eric Fischer
* commit '6e1f4ca15827933cfc05272e6609f76285f34c6d': Import revised translations.
2011-10-18Merge "Import revised translations."Eric Fischer
2011-10-18Import revised translations.Eric Fischer
Change-Id: Id0c0290245886d86b98860dfe028dc4fd3a6788b
2011-10-18am 4bc697c0: (-s ours) am 66e6f388: (-s ours) Import revised translations. ↵Eric Fischer
DO NOT MERGE * commit '4bc697c07234328127701179ec4d957b70a5e2e4': Import revised translations. DO NOT MERGE
2011-10-18am 66e6f388: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit '66e6f388afbf977305024c40f98b1de3829186cd': Import revised translations. DO NOT MERGE
2011-10-18Import revised translations. DO NOT MERGEEric Fischer
Change-Id: I65bc9e4ed0fd99ea937ae93f4c548cc4a48eb052
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 13:41:52 +0000