Baligh Uddin
5244d6378c
am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
...
* commit '41db26ed189bac6ae46b4f5d346839b8ec03cced':
2013-04-10 19:34:26 -07:00
Satoshi Kataoka
82a67bc8bb
am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
...
* commit 'e3c0cca463f9e85657d99cecdf88d4aa3c5c2ee0':
2013-04-10 19:34:24 -07:00
Satoshi Kataoka
d430c1b6bf
am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
...
* commit 'd6f56350fcc63a35506023d555ab66ba3481ad30':
2013-04-10 19:34:23 -07:00
Kurt Partridge
798820ab1d
am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit '3012c891ba1ce9282b38ad06b3249b682365e7a5':
2013-04-10 19:34:22 -07:00
The Android Open Source Project
ab6fa04158
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 'e72a088fe2858cbc479259bdf858e8b4cb348690':
2013-04-10 19:34:20 -07:00
The Android Open Source Project
83346295ea
am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit '2c7b1b82c58e75594f0da1121622caba3b542377':
2013-04-10 19:34:19 -07:00
Baligh Uddin
d3ae58ef1b
am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
...
* commit '3bc22c565eb00ba01582ef7dc6d09679b51022de':
2013-04-10 19:34:18 -07:00
Baligh Uddin
3c163ec173
am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ac68b5cebf77a9411626a4ce7b77ab06ebe513e0':
Import translations. DO NOT MERGE
2013-04-10 19:34:17 -07:00
Baligh Uddin
8acb56b60b
am 128ab7e5: Import translations. DO NOT MERGE
...
* commit '128ab7e5e36e133169f649232a5193f35f9932ca':
Import translations. DO NOT MERGE
2013-04-10 19:34:14 -07:00
Satoshi Kataoka
a2b129e9ae
am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
...
* commit '0b0d9827a01b50d4bbe01ecfa2d42a27dc5069e9':
Move suggest logic to AOSP
2013-04-10 19:34:13 -07:00
Jean-Baptiste Queru
d9f35e3226
am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
...
* commit 'a21bec13357c02f5964e93aaec444f620bf83f60':
2013-04-10 19:34:12 -07:00
The Android Open Source Project
d5c8247fe9
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0f018ab134e9d80ce71e93fb2462b481f3076fb0
2013-04-08 13:36:39 -07:00
The Android Automerger
9320b6def7
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:57:08 -07:00
Ben Cheng
d0c383e147
am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
...
* commit '5a4949c28b594afe983d1c9163bbe0e71d200757':
Force inlining Correction::isSingleQuote
2013-04-04 12:17:12 -07:00
Ben Cheng
5a4949c28b
Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
2013-04-04 19:13:52 +00:00
Ben Cheng
c2fbd7c64d
Force inlining Correction::isSingleQuote
...
Also, only apply -Winline with GCC 4.6. There are some copy constructors
that GCC 4.7/4.8 fail to inline.
Change-Id: I97906045224e89377e8ea6add07a79fa088648af
2013-04-04 11:26:04 -07:00
The Android Automerger
144ff6b0d8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-04 05:56:07 -07:00
The Android Automerger
d4b6393115
am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'df35f7dd2c917869d8c99198b4a61e0f772b6fd9':
Import translations. DO NOT MERGE
2013-04-03 19:39:50 -07:00
Jean Chalard
d1491741b3
am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
...
* commit '1e1d61d2b2b2c06f205ad2af7ace49f47cc27674':
2013-04-03 19:39:49 -07:00
Jean Chalard
b154f10c0d
am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
...
* commit '310f0dbcb8c69395441b67a07b500b9fe0a94925':
2013-04-03 19:39:48 -07:00
Satoshi Kataoka
9414d75d47
am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
...
* commit 'db377ca613e719be37982a2deed520c85c9c335e':
2013-04-03 19:39:47 -07:00
Jean Chalard
be9af787ac
am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
* commit 'e405ec764ac931a18673c3579714c3c568ca4096':
2013-04-03 19:39:46 -07:00
Jean Chalard
ab6ef3b14e
am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
...
* commit 'e1f90dced3a7f09c3dcececd9a089ec979b7e94d':
2013-04-03 19:39:45 -07:00
Kurt Partridge
0c55210606
am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
...
* commit '6c9097fa5182ce3bb139dc7fc6338e240160c7bb':
2013-04-03 19:39:43 -07:00
Baligh Uddin
5db8119d8f
am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '7022bd2333901f515817f5c09536bf2e557f2a1a':
2013-04-03 19:39:42 -07:00
Baligh Uddin
c60d81f5c0
am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit 'a35cea399176218171507d3409ab6d22c7eba775':
2013-04-03 19:39:41 -07:00
The Android Automerger
df35f7dd2c
am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '02dc06a894a1130d08fb6e3bd0d2cf812b726f9d':
Import translations. DO NOT MERGE
2013-04-03 19:36:16 -07:00
Jean Chalard
1e1d61d2b2
am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
...
* commit 'd2a0c6145c8051042527c32b5f63870534d8f14f':
2013-04-03 19:36:15 -07:00
Jean Chalard
310f0dbcb8
am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
...
* commit 'c840ec9eb7b905f50eee67f9b9d8154a45d2283a':
2013-04-03 19:36:14 -07:00
Satoshi Kataoka
db377ca613
am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
...
* commit '64dd4754e3da0b43ad83e891f8dcacdb0e0c37dd':
2013-04-03 19:36:13 -07:00
Jean Chalard
e405ec764a
am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
* commit '1bd8f332a90b5e9defb7e0d9b785ffd7104be940':
2013-04-03 19:36:12 -07:00
Jean Chalard
e1f90dced3
am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
...
* commit '6b29ef46240d1a2bdafda4aac9a0733d8d3370e0':
2013-04-03 19:36:10 -07:00
Kurt Partridge
6c9097fa51
am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
...
* commit '3547bd2932161c760353be6cdad7a99ad104e2b7':
2013-04-03 19:36:09 -07:00
Baligh Uddin
7022bd2333
am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '2741e56d56c9e4cb3cf152d391b909fe8a1c83a0':
2013-04-03 19:36:07 -07:00
Baligh Uddin
a35cea3991
am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '536e7220332794c101fb6bc25707ffc21871b958':
Import translations. DO NOT MERGE
2013-04-03 19:36:06 -07:00
Kurt Partridge
72c2b423fb
am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
...
* commit 'ae0c5f79655363978930de4f7bb711895a46dfb3':
2013-04-03 19:34:20 -07:00
Jean Chalard
3b8d54bf1d
am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit '08a5e43d6168cc0364a99c5bb449c73a376adb50':
2013-04-03 19:34:19 -07:00
Tadashi G. Takaoka
2b3f12897e
am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
...
* commit '06c1baba5437e69c761bd923ac3852d64a73c311':
2013-04-03 19:34:18 -07:00
Satoshi Kataoka
cb4ae59c80
am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
...
* commit 'bb229fe173b6e14edde81eaf3fa2eb0d48c1842a':
2013-04-03 19:34:17 -07:00
Jean Chalard
ed66b23231
am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
...
* commit 'cffac3218f7afca9faad3aa5a3bafbda38777bb6':
2013-04-03 19:34:15 -07:00
Jean Chalard
76dda67548
am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
...
* commit 'c821c723b8ce71044e4b93ed73494e32fbcbf584':
2013-04-03 19:34:14 -07:00
Satoshi Kataoka
8348fe8a09
am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
...
* commit '6f7494e61542036e28514fafad4f839c65ebe447':
2013-04-03 19:34:13 -07:00
The Android Open Source Project
38a9f856e5
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 '228fcdae71f8bf4d2c3ed1e4eea068782971001a':
2013-04-03 19:34:12 -07:00
Satoshi Kataoka
7a3bc77b41
am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
...
* commit 'b980adabe2d488071359f80aa7fa4a31e38f519f':
2013-04-03 19:34:10 -07:00
Jean Chalard
126336be8e
am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
...
* commit '3effa52016870d18c85b468034bc385df07bbbf3':
2013-04-03 19:34:09 -07:00
Tadashi G. Takaoka
1b7451af76
am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
...
* commit '57a7a5c33eeba73cb0e0e6c7871e2f94956fbcbd':
2013-04-03 19:34:08 -07:00
Jean Chalard
db993a5fe4
am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
...
* commit 'ae97a93ab3d585ff4cdee4121686a90e0b5b0934':
2013-04-03 19:34:06 -07:00
Jean Chalard
bb94c6430b
am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
...
* commit '5b2485901b5fff6c63d846e27af7a80ab183d6f3':
2013-04-03 19:34:05 -07:00
Baligh Uddin
ca8ea43197
am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit 'a3ed3254a7aec469b4e902ef4fc78d4194bb17b3':
2013-04-03 19:34:04 -07:00
Baligh Uddin
94065faf7d
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 'c66608308ddcca599b0ad739e3ba46a096bf1871':
2013-04-03 19:34:03 -07:00
