summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* external/svox: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-1/+1
| | | | | Change-Id: I987cf0645cd1281e499426a29c82bdebd74f733b Signed-off-by: Iliyan Malchev <malchev@google.com>
* am baadee21: am 97a3fdf7: Merge "Remove duplicate item to avoid compiling error"David Turner2011-01-311-1/+0
|\ | | | | | | | | * commit 'baadee213d3350ab18fbd0c22a3ac3a65a853a4c': Remove duplicate item to avoid compiling error
| * am 97a3fdf7: Merge "Remove duplicate item to avoid compiling error"David Turner2011-01-311-1/+0
| |\ | | | | | | | | | | | | * commit '97a3fdf7c4228837745cdbe6ff5cb937e2a81b11': Remove duplicate item to avoid compiling error
| | * Merge "Remove duplicate item to avoid compiling error"David Turner2011-01-311-1/+0
| | |\
| | | * Remove duplicate item to avoid compiling errorChih-Wei Huang2010-12-181-1/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | The gcc 4.5 complains about the duplicate item: external/svox/pico/lib/picosig2.c: In function 'sigAllocate': external/svox/pico/lib/picosig2.c:75:26: error: operation on 'sig_inObj->int_vec38' may be undefined Change-Id: I4532b770ff02e058253ed01cbed50b0efb8a83ce
* | | Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I9e9ed9561b018d8629e1c50a98dff1f45d78e2cd
| * \ \ Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ibd50471653e3ceec3404833d8833bb769a204cd4
| | * \ \ am 1c643c7e: (-s ours) Import translations for additional languages.Eric Fischer2011-01-250-0/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '1c643c7e8c13bb758249766b04a7b605179f06fa': Import translations for additional languages.
* | | | | am 4c2a2b9c: Remove redundant translations.Eric Fischer2011-01-261-6/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4c2a2b9c5a740420e8ceed9f6503fc3a7bdb48d4': Remove redundant translations.
| * | | | Remove redundant translations.Eric Fischer2011-01-261-6/+0
| |/ / / | | | | | | | | | | | | Change-Id: Ife383ea64d281351d533b4e413f268a3f1b0dfc7
* | | | am e308def0: Import some unabbreviated translations for large screens.Eric Fischer2011-01-071-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e308def046345231cae47314e4b5de86d9b79194': Import some unabbreviated translations for large screens.
| * | | Import some unabbreviated translations for large screens.Eric Fischer2011-01-061-0/+6
| | | | | | | | | | | | | | | | Change-Id: Ia34391f488d78ea8c7a980efc330b276500256d7
* | | | am 1c643c7e: Import translations for additional languages.Eric Fischer2011-01-060-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '1c643c7e8c13bb758249766b04a7b605179f06fa': Import translations for additional languages.
| * | Import translations for additional languages.Eric Fischer2011-01-0621-0/+630
| | | | | | | | | | | | Change-Id: I69ccc4d420e18384d551ed98cd5591aae1c782be
* | | Don't log an error when SSML has no language.Jean-Michel Trivi2011-01-051-1/+1
| | | | | | | | | | | | Change-Id: I3ce4ce7c121f3f72b242a0edf33b5f6f16e7fdac
* | | Fix bug 2782425 Use the current language if it matches that of the documentJean-Michel Trivi2011-01-041-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an utterance specifies its locale, the checkForLocale() function looks for the index of the supported language that matches it. If the exact locale is not supported, we look for language-only support. But there could already be a match with the currently loaded language. The fix consists in comparing the requested language with the one that is loaded (if any), so we don't load a new one uselessly, AND so the default language is used if it matches. Change-Id: I501d946459ea982466eb804b17e9c43a8203564a
* | | Import revised translations.Eric Fischer2010-12-2320-40/+40
| | | | | | | | | | | | Change-Id: Ie824676fdf1a7bc6a474dbcf34de50c6c2a15c32
* | | Rename Indonesian and Hebrew translations to match Locale.java conventionsEric Fischer2010-12-022-0/+0
| | | | | | | | | | | | Change-Id: I5a2edbfb52b85455a25e5de85a09a7357b57c340
* | | am 467b173c: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2010-11-300-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '467b173c0f53008cda298597b1ce855250353a01': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2010-11-2918-18/+18
| |/ | | | | | | Change-Id: I40a4089fb7d106cdf29c688ca6632d396912e9e7
* | Import revised translations.Eric Fischer2010-11-2918-18/+18
| | | | | | | | Change-Id: Ib16f0528f198b08bace044c74cc192a684d7f9d4
* | Import initial translations for 20 new locales.Eric Fischer2010-11-1720-0/+600
| | | | | | | | Change-Id: I22d1a0084fdfcd6e43aa857d87788f80c19d7642
* | am b86f677f: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2010-11-110-0/+0
|\ \ | |/ | | | | | | * commit 'b86f677faa37dfe00fccd02b04aa652115559796': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2010-11-0918-18/+18
| | | | | | | | Change-Id: Ia06a2d8d482653ac1f84f11395237498bae56c0e
* | Add a CHAR LIMIT comment for the translators.Eric Fischer2010-11-101-1/+1
| | | | | | | | Change-Id: Ib9875a0ceb04604e11b562834966aba5b5901b02
* | Import revised translations.Eric Fischer2010-11-0919-18/+48
| | | | | | | | Change-Id: I43a13ec32ed907122de67ed744dd93dd1254a095
* | Import revised translations.Eric Fischer2010-10-2720-40/+80
| | | | | | | | Change-Id: I3a0898e6892e4600eda600d75491c2230bd0e258
* | am 33f39ae0: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2010-10-270-0/+0
|\ \ | |/
| * Import revised translations. DO NOT MERGEEric Fischer2010-10-261-2/+2
| | | | | | | | Change-Id: If0e462807556ace000dec207b4368393bec59a08
* | am e492027a: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2010-10-250-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit 'e492027ac082fb4fe621e72dd8de76d8db1e9a0a' * commit 'e492027ac082fb4fe621e72dd8de76d8db1e9a0a': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2010-10-2520-40/+40
| | | | | | | | Change-Id: Ic7a75fd6e9eb2700571ddb5aa7b2d79bc0becb2d
* | am 26cfad45: Replace shared storage with USB storage.Eric Fischer2010-10-211-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit '26cfad45869a0258e67f663d8fdf3d822ce62bbf' * commit '26cfad45869a0258e67f663d8fdf3d822ce62bbf': Replace shared storage with USB storage.
| * Replace shared storage with USB storage.Eric Fischer2010-10-201-2/+2
| | | | | | | | Change-Id: If0a64976f0068116ef8927bd831d6ca81cfbe68c
* | am ea88c831: (-s ours) Import revised translationsKenny Root2010-10-150-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit 'ea88c83165a094b24e237cd7f2f1617858744fb0' * commit 'ea88c83165a094b24e237cd7f2f1617858744fb0': Import revised translations
| * Import revised translationsKenny Root2010-10-1420-40/+40
| | | | | | | | Change-Id: Iaf07e3d8fafa46e1fb9ba0ef5f1dc25873b56f5b
* | Manual merge of c90f05adJean-Baptiste Queru2010-10-088-28/+36
|\ \ | |/ | | | | | | | | "Clean up makefiles for TTS data files." Change-Id: I45a8f9887159de4d051455fc3feb202c26b9b8ce
| * Clean up makefiles for TTS data files.Jean-Baptiste Queru2010-10-068-28/+36
| | | | | | | | | | | | | | | | | | | | | | | | This makes them look more like product definition files that can better fit in a product inheritance chain. Also, add a product definition file that includes all languages (amusingly, that's the only combination that's ever used). Bug: 3065214 Change-Id: I42ef6038b7bda5a045562505e4bb2308e36b09f7
* | am 701067da: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2010-09-300-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit '701067da9e0ee3163fe10037c2aeaaa8d2980f33' * commit '701067da9e0ee3163fe10037c2aeaaa8d2980f33': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2010-09-2920-40/+80
| | | | | | | | Change-Id: I4bcd5032e736a585abad8e5303dfd4bc33d01a96
* | am 447b00a5: Split strings with SD card references into variations.Eric Fischer2010-09-291-2/+6
|\ \ | |/ | | | | | | | | | | Merge commit '447b00a5ade6e1293eb40223857a6d4df33f0adf' * commit '447b00a5ade6e1293eb40223857a6d4df33f0adf': Split strings with SD card references into variations.
| * Split strings with SD card references into variations.Eric Fischer2010-09-291-2/+6
| | | | | | | | Change-Id: I7a2e51a2a338c0c61e9fdda119b0b4c85a65439e
* | Merge "Checking in the individual language pack installers."Charles Chen2010-07-19186-0/+6312
|\ \
| * | Checking in the individual language pack installers.Charles Chen2010-06-22186-0/+6312
| | | | | | | | | | | | Change-Id: I00a159eea2e80035f9607fbaacf04aca5ac8a297
* | | am b606be37: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
|\ \ \ | |/ / |/| / | |/ | | | | | | Merge commit 'b606be37244fcb3d5ecb3d1505692585d7f56cf4' * commit 'b606be37244fcb3d5ecb3d1505692585d7f56cf4': add meta-files about 3rd party projects
| * add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| | | | | | | | Change-Id: I81c5b4f0a798ddec196b6727365300a2c3cfd415
* | am aabfeb9a: Import revised translationsKenny Root2010-06-211-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit 'aabfeb9ab9c7eccc8856ead1e5e9106194050376' * commit 'aabfeb9ab9c7eccc8856ead1e5e9106194050376': Import revised translations
| * Import revised translationsKenny Root2010-06-201-2/+2
| | | | | | | | Change-Id: I859893734d775cec2023318de0b05776cf9fac56
* | Remove redundant initilization to get rid of gcc-4.5 warning:Jing Yu2010-05-241-1/+0
|/ | | | | | | | | | | | warning: operation on 'sig_inObj->int_vec38' may be undefined [-Wsequence-point] The source code has cyclic initilization: a = c = b = c. gcc-4.5 reports a warning that c may be undefined. The patch is simply removing the redundant "= c". Tested the patch with all gcc versions. Change-Id: I4a6e9ee22b41058a34b0a657fb60e78c4e8f3ebb
* For issue #2651381, allow library prelinking.Dan Bornstein2010-05-051-2/+0
| | | | Change-Id: I109b34edc12547c644f546c4aaabbc8536579d62
* Fix for bug 2579445 - fix to use the correct strings for the Intent extras.Charles Chen2010-04-072-7/+6
| | | | Change-Id: I26894c0029690bca05baeaee5198589242026130
generated by cgit v1.1 at 2025-01-10 16:57:37 +0000