4580b7e457
Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
2012-10-04 22:42:18 -07:00
80bcb99632
Move gesture detection and recognition paramters to resources
...
Bug: 7032858
Change-Id: I66570a5e21cdeede1eba420c597f440ab61aa941
2012-10-05 14:39:44 +09:00
2087e2961d
am a7950f64: am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'a7950f642bf195d74eb4ed3c579cb7810448d97e':
Import translations. DO NOT MERGE
2012-10-04 22:30:54 -07:00
a7950f642b
am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '47417ec155c38140df51ddea7afd01174e37cea3':
Import translations. DO NOT MERGE
2012-10-04 22:28:52 -07:00
d1c36cffa9
am 3b17c7f3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '3b17c7f3b45eb1c63bdedbdbd62de414f1a414e1':
Import translations. DO NOT MERGE
2012-10-04 22:28:22 -07:00
47417ec155
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-04 22:25:13 -07:00
3b17c7f3b4
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-04 22:24:45 -07:00
ddc8174657
am c8cf1101: am 49d301e9: Add notice for Lexiteria dictionaries.
...
* commit 'c8cf110100b24ed6f968fca194a7090eafb8a9c1':
Add notice for Lexiteria dictionaries.
2012-10-04 19:32:32 -07:00
c8cf110100
am 49d301e9: Add notice for Lexiteria dictionaries.
...
* commit '49d301e9ad470a83048e0a5093cd88e54dd491be':
Add notice for Lexiteria dictionaries.
2012-10-04 19:30:54 -07:00
49d301e9ad
Add notice for Lexiteria dictionaries.
...
Bug: 7285172
Change-Id: Ib4f4e433850d3f58e0a7cef205be4dc59c7f28c4
2012-10-05 11:08:31 +09:00
933e7c3770
am 37c8f8b5: am 20f07e33: Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev
...
* commit '37c8f8b510a13b14a5e043a0735c91609917843d':
Unlink an old file before moving the new file over it
2012-10-04 15:37:51 -07:00
37c8f8b510
am 20f07e33: Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev
...
* commit '20f07e335df4155df2176e6124389a98e25aecf7':
Unlink an old file before moving the new file over it
2012-10-04 15:36:07 -07:00
20f07e335d
Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev
2012-10-04 15:33:41 -07:00
09fbd2ca50
Import translations. DO NOT MERGE
...
Change-Id: Idc0d44ee84d88674227a95bb5556a99a01eb3d30
Auto-generated-cl: translation import
2012-10-04 15:30:10 -07:00
8af854abee
Import translations. DO NOT MERGE
...
Change-Id: I7dfcb0a0db782648b586d36cc5f293c05ebf7c8a
Auto-generated-cl: translation import
2012-10-04 15:29:09 -07:00
ca9140bd13
am e3748309: am 28989acb: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e374830943cf41ed824bea7e991ef63185725397':
Import translations. DO NOT MERGE
2012-10-04 10:40:00 -07:00
6778548d7c
am aee26e8c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'aee26e8c367c70e1c153b2189c8b9a1a7189f39e':
Import translations. DO NOT MERGE
2012-10-04 10:38:30 -07:00
e374830943
am 28989acb: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '28989acb9cb62f505e777e10efe1a60b4f80195d':
Import translations. DO NOT MERGE
2012-10-04 10:38:27 -07:00
28989acb9c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-04 10:36:40 -07:00
aee26e8c36
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-04 10:36:11 -07:00
b38f3406a5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I602a06143ddd4a8de1569b7b2e33ce54c46356a9
2012-10-04 07:50:06 -07:00
6e45a8c761
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-04 07:00:26 -07:00
d173ed18e4
am bf6c8bd8: am 3f7fe829: Merge "Always consider a new line the start of a sentence" into jb-mr1-dev
...
* commit 'bf6c8bd84c273ad04371d0fa8a1a0aac0da91798':
Always consider a new line the start of a sentence
2012-10-04 05:59:04 -07:00
bf6c8bd84c
am 3f7fe829: Merge "Always consider a new line the start of a sentence" into jb-mr1-dev
...
* commit '3f7fe82992a4f62544ac3069903e73c37ca87498':
Always consider a new line the start of a sentence
2012-10-04 05:57:34 -07:00
3f7fe82992
Merge "Always consider a new line the start of a sentence" into jb-mr1-dev
2012-10-04 04:59:29 -07:00
2699b45dbc
Always consider a new line the start of a sentence
...
Bug: 7282523
Change-Id: I10a73e99efdfe6acb9a16819694b98c6714fd451
2012-10-04 20:54:28 +09:00
54ee0905bd
am 62038ee1: am b24cda3c: Fix the Danish dictionary
...
* commit '62038ee1c4bda81fa8a2ceaf26515fefe67551f3':
Fix the Danish dictionary
2012-10-04 01:22:45 -07:00
62038ee1c4
am b24cda3c: Fix the Danish dictionary
...
* commit 'b24cda3c0c5f809ab7dd203a57b485b89db8c62e':
Fix the Danish dictionary
2012-10-04 01:20:15 -07:00
b24cda3c0c
Fix the Danish dictionary
...
Human error: this contained "Nederlands" ("Dutch" in Dutch) as the
human-readable description in the header.
Bug: 7272686
Change-Id: I7a67e7bf1afca6928de7825fb63c5b213e8d7978
2012-10-04 15:52:50 +09:00
c15726482e
Unlink an old file before moving the new file over it
...
This is unlikely to be relevant to this bug, but just in case.
Bug: 7274972
Change-Id: I56b31b377af16cc2c15ceb90a19792bed3aab367
2012-10-04 15:49:08 +09:00
a65a06913f
Import translations. DO NOT MERGE
...
Change-Id: I7bbc24fdd81a547e25e66e07fd982fe949a19bcc
Auto-generated-cl: translation import
2012-10-03 21:56:12 -07:00
e0dc9bd401
Import translations. DO NOT MERGE
...
Change-Id: I268fcab216ee289624aa3067c965856de945388a
Auto-generated-cl: translation import
2012-10-03 21:55:09 -07:00
4520cde454
am 56b4a040: (-s ours) Reconcile with jb-dev - do not merge
...
* commit '56b4a040ff044761268dbeaa2407ebbcf100cb69':
2012-10-03 15:31:15 -07:00
56b4a040ff
Reconcile with jb-dev - do not merge
...
Change-Id: Ie0db4cf684b9f45cdf5a729f3b62adb2128a7c91
2012-10-03 15:29:09 -07:00
e150727be4
am 4c059cc6: am 01d9b1f1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '4c059cc6b67a6b2e61a14ba86b2bcec4fa2f821f':
Import translations. DO NOT MERGE
2012-10-03 10:21:32 -07:00
4c059cc6b6
am 01d9b1f1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '01d9b1f17a2c4aeb281e05a1390447a76cb3d013':
Import translations. DO NOT MERGE
2012-10-03 10:19:54 -07:00
11f72cd4c1
am 3f4d63e5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '3f4d63e50b7a0a6a062f70042ee30ce73f1f06c6':
Import translations. DO NOT MERGE
2012-10-03 10:18:56 -07:00
01d9b1f17a
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-03 10:17:21 -07:00
3f4d63e50b
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-03 10:16:55 -07:00
4a1a8c6ae7
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I7653d40dbf6b2435b5681edd20cf763460422d57
2012-10-03 07:35:19 -07:00
da74af9e68
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 07:00:26 -07:00
6821be7e06
am b3dff914: am 5d11ec46: Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev
...
* commit 'b3dff91404e79d1e4cb5fb968dd19f1200d4d8da':
Update the AOSP dictionaries for the 0-freq review
2012-10-03 06:00:44 -07:00
b3dff91404
am 5d11ec46: Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev
...
* commit '5d11ec461387e45a208c53182628be6dfbd0d8e1':
Update the AOSP dictionaries for the 0-freq review
2012-10-03 05:58:33 -07:00
5d11ec4613
Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev
2012-10-03 05:37:12 -07:00
a44942810d
Update the AOSP dictionaries for the 0-freq review
...
Bug: 7227265
Change-Id: I384f7d76cef67b96b106ddac96e4baf1fa32afd4
2012-10-03 21:15:27 +09:00
967173711f
am e8825ce3: am 1fd10ea2: Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev
...
* commit 'e8825ce3e7392ea9eb385dc24b2e51bc961cd759':
Throw illegal argument exception in BinaryDictionary::editDistance
2012-10-03 01:19:43 -07:00
e8825ce3e7
am 1fd10ea2: Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev
...
* commit '1fd10ea22cb7ac8fb8182bdcb1fea594de9dcf2e':
Throw illegal argument exception in BinaryDictionary::editDistance
2012-10-03 01:17:16 -07:00
1fd10ea22c
Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev
2012-10-03 01:15:52 -07:00
66d955ad71
Throw illegal argument exception in BinaryDictionary::editDistance
...
Bug: 7276803
Change-Id: Icd9bdec0a04179a29d00336819d205627f77b71a
2012-10-03 17:15:47 +09:00
4d009dbc51
am ace7d128: am d445b56c: Fix possible NPE caused while monkey test
...
* commit 'ace7d1285dc1d4ba42d4f767698c5b6078ecbac2':
Fix possible NPE caused while monkey test
2012-10-02 22:43:13 -07:00
Tadashi G. Takaoka
Baligh Uddin
Jean Chalard
Ken Wakasa
The Android Open Source Project
The Android Automerger
Jean-Baptiste Queru
Satoshi Kataoka