Commit graph

9589 commits

Author SHA1 Message Date
Satoshi Kataoka
c5965ffe62 am 49a90081: am a40f2842: am 78fe885f: Merge "Fix addtional proximity correction" into jb-mr1-dev
* commit '49a90081ebaef2e34ea4bb10588b9b0a6e09062c':
  Fix addtional proximity correction
2012-10-05 06:05:10 -07:00
Satoshi Kataoka
595b9ea54a am 478605ba: am 448e7322: Follow up change for I5f166a738f6e84a1b807be
* commit '478605baa460d2d595c7ed0da2790b147727d284':
  Follow up change for  I5f166a738f6e84a1b807be
2012-10-05 06:04:26 -07:00
Satoshi Kataoka
49a90081eb am a40f2842: am 78fe885f: Merge "Fix addtional proximity correction" into jb-mr1-dev
* commit 'a40f2842cf9ed085703518ed16ddd9e9f66560da':
  Fix addtional proximity correction
2012-10-05 06:02:48 -07:00
Satoshi Kataoka
478605baa4 am 448e7322: Follow up change for I5f166a738f6e84a1b807be
* commit '448e732272bb3e55d649d2d5dd6a0acb9efdaec3':
  Follow up change for  I5f166a738f6e84a1b807be
2012-10-05 06:02:02 -07:00
Satoshi Kataoka
a40f2842cf am 78fe885f: Merge "Fix addtional proximity correction" into jb-mr1-dev
* commit '78fe885fb3fcea85e5522ae7a09d12febaca9ba7':
  Fix addtional proximity correction
2012-10-05 06:00:26 -07:00
Satoshi Kataoka
448e732272 Follow up change for I5f166a738f6e84a1b807be
Bug: 7283955
Change-Id: Iec716d75e7c8a727b198688f44ef4a8cd1255ec1
2012-10-05 21:39:28 +09:00
Satoshi Kataoka
78fe885fb3 Merge "Fix addtional proximity correction" into jb-mr1-dev 2012-10-05 05:10:15 -07:00
Satoshi Kataoka
441b3e5a90 Fix addtional proximity correction
Change-Id: I3125764b98af28ce423dc12cbf0dac321ef22386
2012-10-05 20:54:57 +09:00
Tadashi G. Takaoka
9778ac3fdd am d7345ed0: am d34422f1: am 3623b976: Fix detecting fast typing algorithm and parameter
* commit 'd7345ed0b532eaa2082adea6fb5e89f5fe0acb86':
  Fix detecting fast typing algorithm and parameter
2012-10-05 03:22:09 -07:00
Tadashi G. Takaoka
d7345ed0b5 am d34422f1: am 3623b976: Fix detecting fast typing algorithm and parameter
* commit 'd34422f1b2168346c1ebb230db0238680baafacb':
  Fix detecting fast typing algorithm and parameter
2012-10-05 03:21:11 -07:00
Tadashi G. Takaoka
d34422f1b2 am 3623b976: Fix detecting fast typing algorithm and parameter
* commit '3623b9767b3d5f122f574d4c4d14aa79ed305752':
  Fix detecting fast typing algorithm and parameter
2012-10-05 03:19:24 -07:00
Tadashi G. Takaoka
3623b9767b Fix detecting fast typing algorithm and parameter
Bug: 7032858
Change-Id: I5ed701e2394d16e43258a3c22d59991cb18adce8
2012-10-05 18:23:39 +09:00
Yuichiro Hanada
6def28d1da Make unit tests create temporary files in the cache directory.
Change-Id: I90791b364b441bc4e8e221d9e668372d15591719
2012-10-05 15:17:13 +09:00
Ken Wakasa
035b260058 Merge "fix writeCharGroup." 2012-10-04 23:05:51 -07:00
Yuichiro Hanada
d2579c4832 fix writeCharGroup.
Change-Id: Ib841afaba0a20c3b300eb7d3e9133243f9f3ae58
2012-10-05 14:54:17 +09:00
Tadashi G. Takaoka
ddf8b9e1ea am 24ebf7da: am b02fc3fc: am 4580b7e4: Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
* commit '24ebf7da9853f2975bf1ae3e11c0cf1962236667':
  Move gesture detection and recognition paramters to resources
2012-10-04 22:54:16 -07:00
Tadashi G. Takaoka
24ebf7da98 am b02fc3fc: am 4580b7e4: Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
* commit 'b02fc3fcdf47796c9e4101b7fee6e77a9b9cdc0f':
  Move gesture detection and recognition paramters to resources
2012-10-04 22:50:12 -07:00
Tadashi G. Takaoka
b02fc3fcdf am 4580b7e4: Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
* commit '4580b7e457db1cace972ce89bd04542ebfe08845':
  Move gesture detection and recognition paramters to resources
2012-10-04 22:44:47 -07:00
Tadashi G. Takaoka
4580b7e457 Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev 2012-10-04 22:42:18 -07:00
Tadashi G. Takaoka
80bcb99632 Move gesture detection and recognition paramters to resources
Bug: 7032858
Change-Id: I66570a5e21cdeede1eba420c597f440ab61aa941
2012-10-05 14:39:44 +09:00
Baligh Uddin
4b46c2c121 am 2087e296: (-s ours) am a7950f64: am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '2087e2961d41122360df4e0104c49bbc42c0f118':
  Import translations. DO NOT MERGE
2012-10-04 22:33:06 -07:00
Baligh Uddin
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
Baligh Uddin
ca099a39a0 am d1c36cff: (-s ours) am 3b17c7f3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'd1c36cffa9689ed1ec88c1eb6c8d09f4ac49db51':
  Import translations. DO NOT MERGE
2012-10-04 22:30:36 -07:00
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
b931a6c912 Merge "Import translations. DO NOT MERGE" 2012-10-04 22:26:06 -07:00
Baligh Uddin
47417ec155 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 22:25:13 -07:00
Baligh Uddin
3b17c7f3b4 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 22:24:45 -07:00
Jean Chalard
46bd04ca4b am ddc81746: am c8cf1101: am 49d301e9: Add notice for Lexiteria dictionaries.
* commit 'ddc8174657777ff3166e536fb8029a0a0b629481':
  Add notice for Lexiteria dictionaries.
2012-10-04 20:34:21 -07:00
Jean Chalard
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
Jean Chalard
c8cf110100 am 49d301e9: Add notice for Lexiteria dictionaries.
* commit '49d301e9ad470a83048e0a5093cd88e54dd491be':
  Add notice for Lexiteria dictionaries.
2012-10-04 19:30:54 -07:00
Jean Chalard
49d301e9ad Add notice for Lexiteria dictionaries.
Bug: 7285172
Change-Id: Ib4f4e433850d3f58e0a7cef205be4dc59c7f28c4
2012-10-05 11:08:31 +09:00
Ken Wakasa
feac8a91f9 am 933e7c37: am 37c8f8b5: am 20f07e33: Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev
* commit '933e7c3770c00a9eea43c447d96daec1ada62041':
  Unlink an old file before moving the new file over it
2012-10-04 15:40:20 -07:00
Ken Wakasa
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
Ken Wakasa
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
Baligh Uddin
741d6eaf17 Import translations. DO NOT MERGE
Change-Id: I64e38d5f0be5a47923642af0bc0146765e094b77
Auto-generated-cl: translation import
2012-10-04 15:34:17 -07:00
Ken Wakasa
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
Baligh Uddin
09fbd2ca50 Import translations. DO NOT MERGE
Change-Id: Idc0d44ee84d88674227a95bb5556a99a01eb3d30
Auto-generated-cl: translation import
2012-10-04 15:30:10 -07:00
Baligh Uddin
8af854abee Import translations. DO NOT MERGE
Change-Id: I7dfcb0a0db782648b586d36cc5f293c05ebf7c8a
Auto-generated-cl: translation import
2012-10-04 15:29:09 -07:00
Baligh Uddin
cc7c1592bf am ca9140bd: (-s ours) am e3748309: am 28989acb: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'ca9140bd135b84adaa070151cc6ba3e4b97942b1':
  Import translations. DO NOT MERGE
2012-10-04 10:42:01 -07:00
Baligh Uddin
64584c655b am 6778548d: (-s ours) am aee26e8c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '6778548d7cc84426162f8ef208a52575cd2db969':
  Import translations. DO NOT MERGE
2012-10-04 10:40:33 -07:00
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
c19daffa80 Merge "Import translations. DO NOT MERGE" 2012-10-04 10:37:26 -07:00
Baligh Uddin
28989acb9c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:36:40 -07:00
Baligh Uddin
aee26e8c36 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 10:36:11 -07:00
The Android Open Source Project
6f200c9708 am b38f3406: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'b38f3406a5052e1a90358e3ee28cf37a6e506097':
2012-10-04 07:52:40 -07:00
The Android Open Source Project
b38f3406a5 Reconcile with jb-mr1-release - do not merge
Change-Id: I602a06143ddd4a8de1569b7b2e33ce54c46356a9
2012-10-04 07:50:06 -07:00
The Android Automerger
6e45a8c761 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 07:00:26 -07:00