Commit Graph

11489 Commits (11034c340a0b5fc294b69bb1c37e159255dd6ba5)

Author SHA1 Message Date
Jean Chalard 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
Jean Chalard 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
Baligh Uddin 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
Baligh Uddin 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
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
Baligh Uddin 04915a76b4 am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki
* commit 'c33a0ab34327a48180e26011699468e358cab6b2':
2013-04-03 19:33:10 -07:00
Baligh Uddin 51a474224b am a631cede: Import translations. DO NOT MERGE
* commit 'a631cedeeed0dddf7b5b770335df5d30b14afba1':
  Import translations. DO NOT MERGE
2013-04-03 19:33:08 -07:00
The Android Automerger 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
Jean Chalard 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
Jean Chalard c840ec9eb7 am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit '7cd0ffdde4f684e00c2f9805706ab9514e9733dd':
  Fix a test.
2013-04-03 19:33:05 -07:00
Satoshi Kataoka 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
Jean Chalard 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
Jean Chalard 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
Kurt Partridge 3547bd2932 am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '228d45337bdf3bd2bcd0170ddf73ab05b4f7e53f':
  Split LogUnits differently.
2013-04-03 19:33:00 -07:00
Baligh Uddin 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
Baligh Uddin 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
Jean Chalard 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
Jean Chalard 2cb50a05cd am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '93465ea3bbf1a24df861f0fd599e02df1775dfb7':
2013-04-03 19:28:12 -07:00
Baligh Uddin 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
Baligh Uddin 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
Baligh Uddin 41db26ed18 am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '68889f1c3485b2eb2404e34f2da9df350700363e':
2013-04-03 19:28:08 -07:00
Satoshi Kataoka e3c0cca463 am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'e8a3e96447e367714d0ea8c91907573e0694c168':
2013-04-03 19:28:07 -07:00
Satoshi Kataoka d6f56350fc am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '619d1f73d4eda2c235fe45ac9fa1441719545f3e':
2013-04-03 19:28:05 -07:00
Kurt Partridge 3012c891ba am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '867b2380b97e379c34db3e76a7eaf0521ebbe12c':
2013-04-03 19:28:04 -07:00
The Android Open Source Project 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
Kurt Partridge 3ec6a8bdf9 am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '6c522b53f0950fa511bf93e1e506434e7cdef6ad':
  Reorder ResearchLogger call
2013-04-03 19:27:26 -07:00
Jean Chalard 19fe4d4b6b am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit 'bfd7dcd5b2a44d0f1b9c67601fda55a56bae6736':
2013-04-03 19:27:24 -07:00
Tadashi G. Takaoka b1533116f5 am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit 'b08506c2211490fb42617f30dbd8901bf5651b47':
  Interpolate gesture preview trails
2013-04-03 19:27:22 -07:00
Satoshi Kataoka 91d468f5a0 am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit 'ac8703263d6ee3d9f34dac1d8ec9f128abbb2e4b':
  Move policy and session to AOSP
2013-04-03 19:27:21 -07:00
Jean Chalard 873c20ba06 am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit 'e40d5633659a401e1357e1c530238ed74cc158f6':
  Ask the client to make itself known when it's not
2013-04-03 19:27:20 -07:00
Jean Chalard 3b9d7fd179 am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit '151e4e182c86a2b7aea534bda777e9e9aafa549b':
  Fix two nasty bugs with surrogate pairs.
2013-04-03 19:27:19 -07:00
Satoshi Kataoka fdf3c49c8b am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit 'bde25a4a6334f4120ec696c693ab9bf12ee979e4':
  Move dicnode to AOSP
2013-04-03 19:27:18 -07:00
The Android Open Source Project 70616b635a am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '08f5b7802a8e38bf17b4996460946e140b175e3b':
2013-04-03 19:27:17 -07:00
Satoshi Kataoka a9ef902cd8 am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit '70747ad6c34851be522fc25247271a098b72034c':
  Refactor
2013-04-03 19:27:15 -07:00