Tadashi G. Takaoka
|
104923e471
|
am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '863d83ea27af1957a10fca4b42051a9fce399f10':
|
2013-04-10 19:40:29 -07:00 |
Satoshi Kataoka
|
1af04dc698
|
am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '249ad4d57ca477eb7a1ba28d6b0e5a505afa9a97':
|
2013-04-10 19:40:28 -07:00 |
Baligh Uddin
|
97046d1984
|
am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit '1d024eca3f1d055da2977ad0725da203b8035c2e':
|
2013-04-10 19:40:26 -07:00 |
|
Satoshi Kataoka
|
24cf39e787
|
am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '894a8ffcfd76456da3390cd4d3348f0371801669':
|
2013-04-10 19:40:25 -07:00 |
|
Tadashi G. Takaoka
|
59b23bcfae
|
am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit '680d689d859041a666a43a877da79161847f4535':
|
2013-04-10 19:40:24 -07:00 |
The Android Open Source Project
|
2099533306
|
am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '5d674b166d151813718e6bf591573947eb3cae9a':
|
2013-04-10 19:40:23 -07:00 |
Alan Viverette
|
7c9b7f249e
|
am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
* commit 'e592be58095180558f18a36f7f42527a0af0e38a':
|
2013-04-10 19:40:21 -07:00 |
Jean Chalard
|
288deb7ab9
|
am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
* commit '11034c340a0b5fc294b69bb1c37e159255dd6ba5':
|
2013-04-10 19:40:20 -07:00 |
|
Jean Chalard
|
db3713a1b9
|
am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '9f9050d18fc3708badc6f906744d500458c70d36':
|
2013-04-10 19:40:18 -07:00 |
|
Baligh Uddin
|
492016265c
|
am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '0b758ec77fc14f768ddea0693e5d412086a591ef':
|
2013-04-10 19:40:17 -07:00 |
|
Baligh Uddin
|
14d778b27c
|
am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '3847aa30ae68a7e94daa484643ea68f16860d062':
|
2013-04-10 19:40:16 -07:00 |
|
Baligh Uddin
|
e71516b290
|
am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '5244d6378ce3df391ea855e8dbc87e5e648ea042':
|
2013-04-10 19:40:14 -07:00 |
|
Satoshi Kataoka
|
b3796ab2a7
|
am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '82a67bc8bbef7b9553d128f01e0813e63a3ac0ba':
|
2013-04-10 19:40:13 -07:00 |
|
Satoshi Kataoka
|
9ff33b6dfa
|
am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'd430c1b6bfccc11d272ca55894997e0c9efecb0d':
|
2013-04-10 19:40:12 -07:00 |
Kurt Partridge
|
504bbe38f7
|
am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '798820ab1d3c3da6b442f230a2c70ccb83f96ce3':
|
2013-04-10 19:40:10 -07:00 |
|
The Android Open Source Project
|
e279de0265
|
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 'ab6fa041587fcca7abd507f25bc07593074a97f2':
|
2013-04-10 19:40:09 -07:00 |
|
The Android Open Source Project
|
4b176a0104
|
am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '83346295ea6fcd4cf29fbe164bb2df76a6449dc9':
|
2013-04-10 19:40:08 -07:00 |
|
Baligh Uddin
|
b4fbb29551
|
am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'd3ae58ef1b18e015c4f2fe4b46c78eef7be02bb5':
|
2013-04-10 19:40:06 -07:00 |
|
Baligh Uddin
|
792abb730b
|
am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '3c163ec1732d00c9e726f22d27ef92057f685c04':
|
2013-04-10 19:40:05 -07:00 |
|
Baligh Uddin
|
c1f3a8012c
|
am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit '8acb56b60be5ad5009b7ffe96b035c067e03a958':
Import translations. DO NOT MERGE
|
2013-04-10 19:40:04 -07:00 |
|
Satoshi Kataoka
|
a514e95801
|
am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit 'a2b129e9ae369dae3001d2c0efe2b0746421930a':
|
2013-04-10 19:40:03 -07:00 |
Jean-Baptiste Queru
|
784eda74af
|
am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit 'd9f35e322681214ba62e1d89ec6fabfc7ff88c11':
|
2013-04-10 19:40:01 -07:00 |
Ken Wakasa
|
b3cf23de7f
|
am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit 'a271f165b92069a7684a1dfc2c43533dc79fccdd':
Tiny clean up in Makefile
|
2013-04-10 19:35:42 -07:00 |
|
Ken Wakasa
|
ff730a665c
|
am bc2fd24f: am b68e7344: Cleanup the include paths
* commit 'bc2fd24fd3dff57295a1ba4d80d06544e54a820c':
Cleanup the include paths
|
2013-04-10 19:35:41 -07:00 |
|
Satoshi Kataoka
|
c7e1caac44
|
am cd0984a4: am e320789a: Suppress bigram native log
* commit 'cd0984a4ab8f95d40287bb1e450ef169513330df':
Suppress bigram native log
|
2013-04-10 19:35:39 -07:00 |
|
Satoshi Kataoka
|
40d8b652b2
|
am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"
* commit 'dfb680c4650d527f22046f6924f404eaba56709a':
Cleanup suggest interface
|
2013-04-10 19:35:38 -07:00 |
|
Ken Wakasa
|
34cff46a9c
|
am ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings
* commit 'ed8fd94e3c4fd16c0c767c1a45f46461313bdcb8':
Clean up a few option strings under the Advanced settings
|
2013-04-10 19:35:37 -07:00 |
|
Jean Chalard
|
024d0e4abf
|
am f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils"
* commit 'f10e7cbe96596971be5de6592c9cab0aba9ad764':
Move a generic string utility to StringUtils
|
2013-04-10 19:35:36 -07:00 |
Tom Ouyang
|
8ab65b8b4e
|
am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class"
* commit '4096fd08025f2dbafabc2a558a9e15d1561d6234':
Add DigraphUtils class
|
2013-04-10 19:35:34 -07:00 |
Ben Cheng
|
f82a5a24cc
|
am 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
* commit '96cb244d7bedca50fa804d7acdef9767a15cb67e':
|
2013-04-10 19:35:33 -07:00 |
|
Satoshi Kataoka
|
e90df24386
|
am 481412bb: am f3633e9b: Merge "Add flag to turn on new suggest implementation for typing"
* commit '481412bb44d6c3b971b28b490babbcbad4283003':
Add flag to turn on new suggest implementation for typing
|
2013-04-10 19:35:32 -07:00 |
|
Baligh Uddin
|
da90ffe048
|
am 898ec2bf: am 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '898ec2bf850f0786a3ebb7883b2b7c926181f4d9':
|
2013-04-10 19:35:31 -07:00 |
|
Baligh Uddin
|
005df80888
|
am 12db86a6: am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NOT MERGE
* commit '12db86a653d98efe12f35ef0490bae17e5d72af4':
|
2013-04-10 19:35:29 -07:00 |
The Android Automerger
|
ddb50ffff8
|
am d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'd4b6393115a8457fce1ae8be6bf43c1807715cf5':
|
2013-04-10 19:35:28 -07:00 |
|
Jean Chalard
|
edf26bee83
|
am d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
* commit 'd1491741b3674a5794eda4fe2d5800ab4c551dfe':
|
2013-04-10 19:35:27 -07:00 |
|
Jean Chalard
|
3090e8c861
|
am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit 'b154f10c0dd2d18dfa2794ca97d987442435b629':
|
2013-04-10 19:35:26 -07:00 |
|
Satoshi Kataoka
|
e8f7d669c5
|
am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit '9414d75d47075eb484bf2ec43b80aa233b8d9fe3':
|
2013-04-10 19:35:24 -07:00 |
|
Jean Chalard
|
de19e16154
|
am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
* commit 'be9af787ac08d27a5a81aa91b20bcb6d69086857':
|
2013-04-10 19:35:23 -07:00 |
|
Jean Chalard
|
cb7983e4e2
|
am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit 'ab6ef3b14ee09e3903ec5b48138237033b1e54b6':
|
2013-04-10 19:35:22 -07:00 |
|
Kurt Partridge
|
5d337ad68a
|
am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '0c55210606d0a751ac04c7ff5544cb295fa920e2':
|
2013-04-10 19:35:21 -07:00 |
|
Baligh Uddin
|
27fede0b06
|
am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '5db8119d8f526a191bbbe1a48e42a9ab4c834ce8':
|
2013-04-10 19:35:20 -07:00 |
|
Baligh Uddin
|
f4be755819
|
am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'c60d81f5c06a741ed3571269d4b0da03bb10ecab':
|
2013-04-10 19:35:18 -07:00 |
|
Kurt Partridge
|
538974d0ea
|
am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '72c2b423fb04957250af433e3319ffb2d815a898':
|
2013-04-10 19:35:17 -07:00 |
|
Jean Chalard
|
a7da57decc
|
am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit '3b8d54bf1d45b8112cffe963759fe8c52d7afe8f':
|
2013-04-10 19:35:16 -07:00 |
|
Tadashi G. Takaoka
|
8a984e8c4d
|
am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '2b3f12897e776e0e9feb34d6f800cb869a85b878':
|
2013-04-10 19:35:15 -07:00 |
|
Satoshi Kataoka
|
bc36fbfc6c
|
am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit 'cb4ae59c807cccc13a850643b06cd777d550c72c':
|
2013-04-10 19:35:13 -07:00 |
|
Jean Chalard
|
2cd99981bd
|
am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit 'ed66b23231413e8ae97ad0bae037c8e2a65f4dcf':
|
2013-04-10 19:35:12 -07:00 |
|
Jean Chalard
|
f921a58784
|
am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit '76dda67548dc8c227b0c0304003ea7a2fdd1c501':
|
2013-04-10 19:35:11 -07:00 |
|
Satoshi Kataoka
|
5180572736
|
am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit '8348fe8a09f483aefffe10d4b876e09ccf19eb1a':
|
2013-04-10 19:35:10 -07:00 |
|
The Android Open Source Project
|
cfe49191f7
|
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 '38a9f856e58e92c10a932602bfe9e29ebf2a6ec9':
|
2013-04-10 19:35:08 -07:00 |