894a8ffcfd
am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
...
* commit '9f419592ff7d5a67cc978814cfa1fe443ab35407':
2013-04-10 19:34:37 -07:00
680d689d85
am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit 'c61393c8ef6f6c1fd7e48b9c505fb3300bf992a2':
2013-04-10 19:34:35 -07:00
5d674b166d
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 '5517262476b8bb22953f8491fb88dd01c0880a7e':
2013-04-10 19:34:34 -07:00
e592be5809
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 '046a311a134a15c5f3d9465e03a4e796def1b6b9':
2013-04-10 19:34:32 -07:00
11034c340a
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 'dee08de2c5bc71fdeb3182a8ddd1a10568ac33ef':
2013-04-10 19:34:31 -07:00
9f9050d18f
am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
...
* commit '2cb50a05cd1d35a422666b6893a2a77c69c1b700':
2013-04-10 19:34:30 -07:00
0b758ec77f
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 'e7edb5617447cf00eaedb33f5df87223c81209cf':
2013-04-10 19:34:28 -07:00
3847aa30ae
am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
...
* commit '781195f438226e1f556850198c5e51b19523ba63':
2013-04-10 19:34:27 -07:00
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
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
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
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
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
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
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
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
8acb56b60b
am 128ab7e5: Import translations. DO NOT MERGE
...
* commit '128ab7e5e36e133169f649232a5193f35f9932ca':
Import translations. DO NOT MERGE
2013-04-10 19:34:14 -07:00
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
d9f35e3226
am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
...
* commit 'a21bec13357c02f5964e93aaec444f620bf83f60':
2013-04-10 19:34:12 -07:00
d5c8247fe9
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0f018ab134e9d80ce71e93fb2462b481f3076fb0
2013-04-08 13:36:39 -07:00
9320b6def7
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:57:08 -07:00
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
5a4949c28b
Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
2013-04-04 19:13:52 +00:00
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
144ff6b0d8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-04 05:56:07 -07:00
04915a76b4
am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit 'c33a0ab34327a48180e26011699468e358cab6b2':
2013-04-03 19:33:10 -07:00
51a474224b
am a631cede: Import translations. DO NOT MERGE
...
* commit 'a631cedeeed0dddf7b5b770335df5d30b14afba1':
Import translations. DO NOT MERGE
2013-04-03 19:33:08 -07:00
02dc06a894
am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '21484175789bd2c56c8f0f287149a02922fda2d0':
Import translations. DO NOT MERGE
2013-04-03 19:33:07 -07:00
d2a0c6145c
am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
...
* commit 'b4e2a3bb4ededabce573e90fe0d82dda0fb2d8cb':
Change which backdoor the tests goes through
2013-04-03 19:33:06 -07:00
c840ec9eb7
am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
...
* commit '7cd0ffdde4f684e00c2f9805706ab9514e9733dd':
Fix a test.
2013-04-03 19:33:05 -07:00
64dd4754e3
am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
...
* commit '63742fe53072a9a706c4bfc51dde00c5fbb9829a':
Move typing policy to AOSP
2013-04-03 19:33:04 -07:00
1bd8f332a9
am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
...
* commit '6531bcdc82958463a94482acc37d0f23578bb662':
Revert "[DO NOT MERGE] Activate hardware keyboard handling"
2013-04-03 19:33:02 -07:00
6b29ef4624
am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
...
* commit '558f41d4020a6714146dfd6f9508742c29ce9edd':
[DO NOT MERGE] Activate hardware keyboard handling
2013-04-03 19:33:01 -07:00
3547bd2932
am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
...
* commit '228d45337bdf3bd2bcd0170ddf73ab05b4f7e53f':
Split LogUnits differently.
2013-04-03 19:33:00 -07:00
2741e56d56
am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '0491706a533cde9b3f7e8e9fe3e81e0ac4ed4799':
Import translations. DO NOT MERGE
2013-04-03 19:32:59 -07:00
536e722033
am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '9bf7e74dc4b29978a92d96de5b404c20677a249c':
Import translations. DO NOT MERGE
2013-04-03 19:32:59 -07:00
9f419592ff
am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
...
* commit 'c3c1b4db786a379345209ac0046ec1b5cab55d0c':
2013-04-03 19:28:18 -07:00
c61393c8ef
am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit '56642281573a89d96f13f1861ffbd7461f870079':
2013-04-03 19:28:17 -07:00
5517262476
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 'b2c2ce310cdb3218b5198f4135a8dfac0d9c14cb':
2013-04-03 19:28:15 -07:00
046a311a13
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 'd19c71d98432f57b2c84d5741b8f2f27cb1b1f28':
2013-04-03 19:28:14 -07:00
dee08de2c5
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 '724ff2980d429e62557df73d588be2d678175716':
2013-04-03 19:28:13 -07:00
2cb50a05cd
am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
...
* commit '93465ea3bbf1a24df861f0fd599e02df1775dfb7':
2013-04-03 19:28:12 -07:00
e7edb56174
am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
...
* commit '1368eeee15a7d1378139baec9e085b25fe32039c':
2013-04-03 19:28:10 -07:00
781195f438
am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
...
* commit '119eaf7a2742504fbaac65665e5c3a64fcfe5339':
2013-04-03 19:28:09 -07:00
41db26ed18
am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
...
* commit '68889f1c3485b2eb2404e34f2da9df350700363e':
2013-04-03 19:28:08 -07:00
e3c0cca463
am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
...
* commit 'e8a3e96447e367714d0ea8c91907573e0694c168':
2013-04-03 19:28:07 -07:00
d6f56350fc
am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
...
* commit '619d1f73d4eda2c235fe45ac9fa1441719545f3e':
2013-04-03 19:28:05 -07:00
3012c891ba
am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit '867b2380b97e379c34db3e76a7eaf0521ebbe12c':
2013-04-03 19:28:04 -07:00
e72a088fe2
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 'a6dcb55eabfdfe68699a91b5bbf26616dd569b8f':
2013-04-03 19:28:03 -07:00
3ec6a8bdf9
am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
...
* commit '6c522b53f0950fa511bf93e1e506434e7cdef6ad':
Reorder ResearchLogger call
2013-04-03 19:27:26 -07:00
Satoshi Kataoka
Tadashi G. Takaoka
The Android Open Source Project
Alan Viverette
Jean Chalard
Baligh Uddin
Kurt Partridge
Jean-Baptiste Queru
The Android Automerger
Ben Cheng