The Android Open Source Project
|
740243cb69
|
am cf0c1a7d: am 19289df5: am e279de02: (-s ours) am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'cf0c1a7d6ea4f05c46addde2bfd961abcff656f8':
|
2013-04-17 19:44:04 -07:00 |
|
The Android Open Source Project
|
1996320a72
|
am faa9a5ec: am d9f9ba39: am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit 'faa9a5ecc799e39a203c032762db0c3f13f7786e':
|
2013-04-17 19:44:02 -07:00 |
Baligh Uddin
|
403354bae9
|
am bc5075e0: am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'bc5075e0dacdf6caeaf0880e3dae560c1844158b':
|
2013-04-17 19:44:01 -07:00 |
|
Baligh Uddin
|
2c71e8266e
|
am 4d5ebdf5: am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '4d5ebdf53f4e0732ab1ae24b5d7262dff080d9ce':
|
2013-04-17 19:43:59 -07:00 |
|
Baligh Uddin
|
9f2573e465
|
am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit 'ea0d7ecd979d1e339a27841dd9aece281fd751d9':
|
2013-04-17 19:43:58 -07:00 |
Satoshi Kataoka
|
4c767c8169
|
am b2230d90: am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit 'b2230d9073211e6d460cc5c3a5245bff4ca1cfa6':
|
2013-04-17 19:43:56 -07:00 |
Jean-Baptiste Queru
|
6e5857cba2
|
am 67953e4d: am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '67953e4da485596dea42c2f952b3207e29c77ed0':
|
2013-04-17 19:43:55 -07:00 |
Kurt Partridge
|
89ccc962e5
|
am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
* commit '9cf3937281092c45efd14c9f4cadadd60ba8e245':
|
2013-04-17 19:43:54 -07:00 |
Tom Ouyang
|
44eabffc26
|
am e9de986d: am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit 'e9de986d412e8512e6d63aa058b14355a872ca5f':
|
2013-04-17 19:43:52 -07:00 |
|
Tom Ouyang
|
0de0fa3baf
|
am 0ca76c94: am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit '0ca76c94f5c669a83483edd90c3e000c05edfaf0':
|
2013-04-17 19:43:51 -07:00 |
|
Kurt Partridge
|
eba670d073
|
am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit '6267ec688ef8f2a5fb6b338170b3f1342c35e93d':
|
2013-04-17 19:43:49 -07:00 |
|
Baligh Uddin
|
7c0257aef5
|
am 60ffda41: am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERGE
* commit '60ffda411fa78e7a4df044ba1bc47cd356a6eac8':
|
2013-04-17 19:43:48 -07:00 |
|
Baligh Uddin
|
b155cedc58
|
am 855b8053: am d86e14ae: Import translations. DO NOT MERGE
* commit '855b80531222e419b65d915c78f6dbab90c76626':
Import translations. DO NOT MERGE
|
2013-04-17 19:43:47 -07:00 |
Jean Chalard
|
9129c0d1f6
|
am 7503ef33: am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
* commit '7503ef330c2c700a701b2ad991afdd3c97ccc741':
|
2013-04-17 19:43:46 -07:00 |
Tadashi G. Takaoka
|
ef2d15553b
|
am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit 'c627f6427428a9fd2a2e1571b27a6a8971679198':
|
2013-04-17 19:43:45 -07:00 |
|
Tadashi G. Takaoka
|
4490531676
|
am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit '45163044364ec25186da1cb4098d528d756919d4':
|
2013-04-17 19:43:43 -07:00 |
|
Tadashi G. Takaoka
|
70a79ee60d
|
am 8ea774eb: am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
* commit '8ea774ebf23f18e34d4ff98bd54062b75659221f':
|
2013-04-17 19:43:42 -07:00 |
|
Jean Chalard
|
f514024aaf
|
am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
* commit '818b7d4686d9fe68ea463eae3b903142978c8e7b':
|
2013-04-17 19:43:40 -07:00 |
|
Jean Chalard
|
8e7e9df145
|
am 99e91fc8: am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
* commit '99e91fc8ec21fec3dc16a12004f9c69d5a4f47da':
|
2013-04-17 19:43:39 -07:00 |
|
Tadashi G. Takaoka
|
21dd8537db
|
am 9a0f6ef8: am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
* commit '9a0f6ef8472401df3241cf2a85e344c11e38267a':
|
2013-04-17 19:43:37 -07:00 |
|
Tadashi G. Takaoka
|
f8a1317f4d
|
am f0a4508a: am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"
* commit 'f0a4508ad52f3b3cd685da81d3bcfcbbb34b9304':
|
2013-04-17 19:43:36 -07:00 |
Keisuke Kuroynagi
|
cde2172412
|
am 5c7c36e3: am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
* commit '5c7c36e31f609dbaba4a04bbeff2b273b9ee16fc':
|
2013-04-17 19:43:35 -07:00 |
|
Tadashi G. Takaoka
|
86726e2197
|
am 6f6edd76: am ae8a941e: am f606fd85: Hide Setup Wizard icon for stock keyboard
* commit '6f6edd76f82cc229441b9fcd4111ad49f72b0a6e':
|
2013-04-17 19:43:33 -07:00 |
|
Tadashi G. Takaoka
|
a51ddebb7c
|
am 0d9164ec: am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
* commit '0d9164ecd812c1cbfd5393a82dee4cf5cd982daa':
|
2013-04-17 19:43:32 -07:00 |
|
Tom Ouyang
|
20d54cab2a
|
am 6a0f11cc: am ff981cc3: am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
* commit '6a0f11cc91c77fea781b736171718211f27415b9':
|
2013-04-17 19:43:30 -07:00 |
|
Baligh Uddin
|
fe4c83c6bf
|
am 1646267f: am 8e7ca6be: am 224e969e: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '1646267fdfba63c1dad25274bd8d5a168dabfa58':
|
2013-04-17 19:43:29 -07:00 |
|
Baligh Uddin
|
79dcc4f009
|
am 2eede9f4: am 13811400: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '2eede9f46d46b8961b02403197cf78a8fbc356a8':
Import translations. DO NOT MERGE
|
2013-04-17 19:43:27 -07:00 |
|
Jean Chalard
|
ce2a5f93ae
|
am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
* commit '44590a161fd15dcd8879c8f9eada15eee2234b50':
|
2013-04-17 19:40:25 -07:00 |
|
Jean Chalard
|
01a862fba3
|
am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit 'fd59acceff4deec5000dde5af431486e487d8a7c':
|
2013-04-17 19:40:24 -07:00 |
|
Kurt Partridge
|
0f8c86c8ea
|
am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit 'a3837fd1a0a01d34a7e6ef73e51c79d91e143c7a':
|
2013-04-17 19:40:22 -07:00 |
|
Baligh Uddin
|
08f0697bc3
|
am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '6a7f4639759864689a155fcc567a5b21b6993cb2':
|
2013-04-17 19:40:19 -07:00 |
|
Baligh Uddin
|
fbc9145961
|
am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '6ff63273e748484684ecae9c757615b68c8c6f49':
|
2013-04-17 19:40:18 -07:00 |
|
Kurt Partridge
|
3a63e4e3b8
|
am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '3fcaa3e8b4920dca0560e122a8a309087d02b26c':
|
2013-04-17 19:40:16 -07:00 |
|
Jean Chalard
|
56e931de80
|
am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit 'feb16b6d4f37156d7a42589c210a2c6759349935':
|
2013-04-17 19:40:15 -07:00 |
|
Tadashi G. Takaoka
|
85fca857af
|
am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '300d3bdee5ab6c3804e0c47ba0665a2d2140c56f':
|
2013-04-17 19:40:14 -07:00 |
|
Satoshi Kataoka
|
eeb386390a
|
am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit '656900003c92a370e3ac2e32b84631c1906d7d31':
|
2013-04-17 19:40:12 -07:00 |
|
Jean Chalard
|
e29ffdb6c6
|
am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit 'c14fdded82fb293bd6d5a7b5487e4c6b0c8625dd':
|
2013-04-17 19:40:11 -07:00 |
|
Jean Chalard
|
267e61790a
|
am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit 'c26022cf59801de74e19fda38a7aff76f3039ad4':
|
2013-04-17 19:40:10 -07:00 |
|
Satoshi Kataoka
|
371369d9f1
|
am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit 'd196cb6400c074c7c03416b62c2428986c3a74e2':
|
2013-04-17 19:40:09 -07:00 |
|
The Android Open Source Project
|
e2cc803c46
|
am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'a0b2dc74fa521cf584536b72e390f2aadb48d42b':
|
2013-04-17 19:40:07 -07:00 |
|
Satoshi Kataoka
|
1417566219
|
am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit 'b949db38568d02be216a9986ed0992ae57f0c13b':
|
2013-04-17 19:40:06 -07:00 |
|
Jean Chalard
|
34c0bef675
|
am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '9a181179b2c8ec8ee4b0468158cb565af8ceda8e':
|
2013-04-17 19:40:04 -07:00 |
|
Tadashi G. Takaoka
|
c01de7259d
|
am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '023ed8a661c792d6ab0e405469296971c27ddc4c':
|
2013-04-17 19:40:03 -07:00 |
|
Jean Chalard
|
a6ec1871fe
|
am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit '3f17ab4139e586536ea90a5d7d183ae78f273e00':
|
2013-04-17 19:40:02 -07:00 |
|
Jean Chalard
|
ccb3dc0225
|
am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '0eb58dfe0c30b9cbc34771bae2cda48fa94d2f79':
|
2013-04-17 19:40:00 -07:00 |
|
Baligh Uddin
|
2456eb3a25
|
am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit 'faa708c326b360eb6097587291727aff1a87fe56':
|
2013-04-17 19:39:59 -07:00 |
|
Baligh Uddin
|
f205c25863
|
am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit 'dbf9168f8616df012dc1faeaf3bffe34d7057d6a':
|
2013-04-17 19:39:57 -07:00 |
The Android Automerger
|
13ac43b3e6
|
am 2cb2c001: am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '2cb2c001661383aa79f21992c4d783f2cb856c80':
|
2013-04-17 19:39:56 -07:00 |
|
Tadashi G. Takaoka
|
f6f20ab26b
|
am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '19b5a10407838dd5f05bdca1663d6615313e131b':
|
2013-04-17 19:39:54 -07:00 |
|
Tadashi G. Takaoka
|
9a2c21bab9
|
am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit '6e5363219506060390aabc79e60f7a280f5693a6':
|
2013-04-17 19:39:53 -07:00 |