Kurt Partridge
|
a6092dc8a5
|
am 504bbe38 : am 798820ab : am 3012c891 : am 867b2380 : am 35e02ccd : am bf62dc03 : am ef103e1f : Merge "Close ResearchLogger upon onFinishInputView"
* commit '504bbe38f7ca172a88a10c83064d8dda81e5d1dd':
|
2013-04-10 19:45:34 -07:00 |
|
The Android Open Source Project
|
19289df5e4
|
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 'e279de0265b985d2980d1cf7973e9b81f068b933':
|
2013-04-10 19:45:32 -07:00 |
|
The Android Open Source Project
|
d9f9ba395f
|
am 4b176a01 : (-s ours) am 83346295 : am 2c7b1b82 : am d2582473 : (-s ours) am 22953740 : Reconcile with jb-mr2-release - do not merge
* commit '4b176a0104adb5f76809b847463cd665d5b75933':
|
2013-04-10 19:45:31 -07:00 |
|
Baligh Uddin
|
536ec3bf58
|
am b4fbb295 : (-s ours) am d3ae58ef : am 3bc22c56 : am e7d91194 : (-s ours) am 370070ae : am 4cdb7ccb : Import translations. DO NOT MERGE
* commit 'b4fbb295511efd42d164454386f1b756df9854f5':
|
2013-04-10 19:45:29 -07:00 |
|
Baligh Uddin
|
f420e3bf9a
|
am 792abb73 : (-s ours) am 3c163ec1 : am ac68b5ce : am 4b8494c4 : (-s ours) Import translations. DO NOT MERGE
* commit '792abb730b813fda85500092d24634b7ab7008e3':
|
2013-04-10 19:45:27 -07:00 |
|
Baligh Uddin
|
82c49d746d
|
am c1f3a801 : (-s ours) am 8acb56b6 : am 128ab7e5 : Import translations. DO NOT MERGE
* commit 'c1f3a8012cb5b7a879c7485a5eac846571ad3c5e':
|
2013-04-10 19:45:25 -07:00 |
|
Satoshi Kataoka
|
62f52e4fce
|
am a514e958 : am a2b129e9 : am 0b0d9827 : am 95fe8267 : Move suggest logic to AOSP
* commit 'a514e9580115c059bd509f7a0b58a0086c60ac91':
|
2013-04-10 19:45:23 -07:00 |
|
Jean-Baptiste Queru
|
626dd2a0ab
|
am 784eda74 : (-s ours) am d9f35e32 : am a21bec13 : am 30667266 : (-s ours) am 5bcb3876 : Merge 2caa1d81ce - do not merge
* commit '784eda74afcc48876972bb00cf504d4049b00f16':
|
2013-04-10 19:45:22 -07:00 |
|
Baligh Uddin
|
269f141bed
|
am cfdc91b9 : am 58df3cfa : Import translations. DO NOT MERGE
* commit 'cfdc91b99abbb985a7e9207020b95b1df807d567':
Import translations. DO NOT MERGE
|
2013-04-10 19:41:45 -07:00 |
|
Tadashi G. Takaoka
|
ac018da68c
|
am 9620943c : am d9a22235 : Hide Setup Wizard icon for stock keyboard
* commit '9620943cc80e8f709e1cd53af7bf77a0e717d3db':
Hide Setup Wizard icon for stock keyboard
|
2013-04-10 19:41:44 -07:00 |
|
Jean Chalard
|
defd295068
|
am 1aaaa64d : am 75618c33 : am 19dcd154 : Merge "Offer to add any OOV typed word to the dictionary."
* commit '1aaaa64da8d818dd7a91c024eb4fa2d9e1459f93':
|
2013-04-10 19:41:43 -07:00 |
|
Satoshi Kataoka
|
d355283f56
|
am fd89cd20 : am daef4e8f : am f31553bc : Merge "Fix touch coordinate calibration"
* commit 'fd89cd20c956ce9618353dcd5d7648a2bab3b7ab':
|
2013-04-10 19:41:41 -07:00 |
|
Jean Chalard
|
e040aa197e
|
am 0d72a230 : am 04bb419c : am ddafcf82 : Merge "Fix bugs and add tests"
* commit '0d72a23054341a8e216a33c0191cace1edc0cff9':
|
2013-04-10 19:41:40 -07:00 |
|
Kurt Partridge
|
e2bdf6861a
|
am bea42fc5 : am 5bd24642 : am 1f70a4d6 : Merge "Allow logging while replaying"
* commit 'bea42fc5bd1e4053e7cf7a3a51021d771d939f97':
|
2013-04-10 19:41:39 -07:00 |
|
Kurt Partridge
|
1944521bed
|
am 41a049a4 : am ae144fe9 : am d117c1a1 : Merge "Do not record log split time when handling separator"
* commit '41a049a410a921abdb896450abe3c6010a71d9e6':
|
2013-04-10 19:41:38 -07:00 |
|
The Android Open Source Project
|
c89354b9af
|
am fb899d85 : am 3019a5e1 : am a8d29082 : (-s ours) am d5c8247f : Reconcile with jb-mr2-release - do not merge
* commit 'fb899d85ee3497dbb9443fbbee0241aaf94f2e52':
|
2013-04-10 19:41:37 -07:00 |
|
Ken Wakasa
|
d01118aeba
|
am 4c896a2f : am f71b9640 : am d17c8bd9 : Update comments
* commit '4c896a2fe81748990786288eff28b00233423da9':
|
2013-04-10 19:41:35 -07:00 |
|
Ken Wakasa
|
3f55a951e9
|
am b3cf23de : am a271f165 : am 31f42ba0 : Tiny clean up in Makefile
* commit 'b3cf23de7f30eb4c9c8c757d8b02a12fdad026aa':
|
2013-04-10 19:41:34 -07:00 |
|
Ken Wakasa
|
e4d60a2db0
|
am ff730a66 : am bc2fd24f : am b68e7344 : Cleanup the include paths
* commit 'ff730a665cc90aec1c795c8555e8563ff1bfbc37':
|
2013-04-10 19:41:33 -07:00 |
|
Satoshi Kataoka
|
c7d4f50233
|
am c7e1caac : am cd0984a4 : am e320789a : Suppress bigram native log
* commit 'c7e1caac44238d53f635ee1660cb767d122b7416':
|
2013-04-10 19:41:32 -07:00 |
|
Satoshi Kataoka
|
23b62c9387
|
am 40d8b652 : am dfb680c4 : am f5e18e99 : Merge "Cleanup suggest interface"
* commit '40d8b652b2fce9246ad34b7f78719b83348136a7':
|
2013-04-10 19:41:30 -07:00 |
|
Ken Wakasa
|
1c9da7af48
|
am 34cff46a : am ed8fd94e : am 370461ef : Clean up a few option strings under the Advanced settings
* commit '34cff46a9ca4fc8bdd1d074b94597859bde08a4a':
|
2013-04-10 19:41:29 -07:00 |
|
Jean Chalard
|
8178241912
|
am 024d0e4a : am f10e7cbe : am e9f69e16 : Merge "Move a generic string utility to StringUtils"
* commit '024d0e4abf9d3bfacfb5495fa27a512c266df114':
|
2013-04-10 19:41:28 -07:00 |
|
Tom Ouyang
|
3c15067b0e
|
am 8ab65b8b : am 4096fd08 : am 08fd3d95 : Merge "Add DigraphUtils class"
* commit '8ab65b8b4eb5815398db8abb0a0dfc02f613445e':
|
2013-04-10 19:41:26 -07:00 |
|
Ben Cheng
|
7629394953
|
am f82a5a24 : am 96cb244d : am 65534ffc : am d0c383e1 : am 5a4949c2 : Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
* commit 'f82a5a24ccc6d9e8a77f49ebb1a58f64d174c59f':
|
2013-04-10 19:41:25 -07:00 |
|
Satoshi Kataoka
|
b3d7d07e58
|
am e90df243 : am 481412bb : am f3633e9b : Merge "Add flag to turn on new suggest implementation for typing"
* commit 'e90df24386ca22689abccaacf70a087912c00343':
|
2013-04-10 19:41:24 -07:00 |
|
Baligh Uddin
|
1270880eaa
|
am da90ffe0 : am 898ec2bf : am 5a5db35d : am 04915a76 : am c33a0ab3 : keep history after reset to jb-ub-latinimegoogle-azuki
* commit 'da90ffe048850df35a1a8d159d6b50eb2c14bda6':
|
2013-04-10 19:41:23 -07:00 |
|
Baligh Uddin
|
83c5ec6b3b
|
am 005df808 : am 12db86a6 : am c48fe5d1 : (-s ours) am 51a47422 : am a631cede : Import translations. DO NOT MERGE
* commit '005df80888657650ce6c39ecc4c61cb8974f6234':
|
2013-04-10 19:41:22 -07:00 |
|
The Android Automerger
|
ed19c0053f
|
am ddb50fff : am d4b63931 : am df35f7dd : am 02dc06a8 : am 21484175 : merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'ddb50ffff8227750a160dd26de4ae63a56f4ed1a':
|
2013-04-10 19:41:21 -07:00 |
|
Jean Chalard
|
4d21e347df
|
am edf26bee : am d1491741 : am 1e1d61d2 : am d2a0c614 : am b4e2a3bb : am 868805ae : Merge "Change which backdoor the tests goes through"
* commit 'edf26bee83603fdd6035f438c16096e4f00f820d':
|
2013-04-10 19:41:19 -07:00 |
|
Jean Chalard
|
f6de7890ca
|
am 3090e8c8 : am b154f10c : am 310f0dbc : am c840ec9e : am 7cd0ffdd : am 248dcdf0 : Merge "Fix a test."
* commit '3090e8c861687d123ac8c5a4073b03f671597ec0':
|
2013-04-10 19:41:18 -07:00 |
|
Satoshi Kataoka
|
23408ee603
|
am e8f7d669 : am 9414d75d : am db377ca6 : am 64dd4754 : am 63742fe5 : am d2a04e1e : Merge "Move typing policy to AOSP"
* commit 'e8f7d669c53a5d8d5aa215b2a9e793ef2b5d88e6':
|
2013-04-10 19:41:16 -07:00 |
|
Jean Chalard
|
9d071843a4
|
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 'de19e1615400e8d55d84da185c38e91f22f27be0':
|
2013-04-10 19:41:15 -07:00 |
|
Jean Chalard
|
5a6b0787be
|
am cb7983e4 : am ab6ef3b1 : am e1f90dce : (-s ours) am 6b29ef46 : am 558f41d4 : am c741f1f8 : (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit 'cb7983e4e29dab246998a2d2d382dafaefa40570':
|
2013-04-10 19:41:14 -07:00 |
|
Kurt Partridge
|
4c74aaa09a
|
am 5d337ad6 : am 0c552106 : am 6c9097fa : am 3547bd29 : am 228d4533 : am 5779bc91 : Merge "Split LogUnits differently."
* commit '5d337ad68adf380df593e3f38c39f9b7851b0660':
|
2013-04-10 19:41:13 -07:00 |
|
Baligh Uddin
|
4a41a48fdb
|
am 27fede0b : am 5db8119d : am 7022bd23 : (-s ours) am 2741e56d : am 0491706a : am 02fc1ed5 : (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '27fede0b06d05dbc94585087c7f97453ac98593e':
|
2013-04-10 19:41:11 -07:00 |
|
Baligh Uddin
|
166b3f98d8
|
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 'f4be7558190bc638335f59e46fb2d9558eb75e8a':
|
2013-04-10 19:41:10 -07:00 |
|
Kurt Partridge
|
1dc4a24f96
|
am 538974d0 : am 72c2b423 : am ae0c5f79 : am 3ec6a8bd : am 6c522b53 : am 0c0ab2b4 : Merge "Reorder ResearchLogger call"
* commit '538974d0ea4afea621490a71d509468e13d88485':
|
2013-04-10 19:41:09 -07:00 |
|
Jean Chalard
|
b8a3454d1a
|
am a7da57de : am 3b8d54bf : am 08a5e43d : am 19fe4d4b : am bfd7dcd5 : am 0745fe83 : am b8869ec1 : am 0fcc4960 : Deactivate hardware keyboard handling.
* commit 'a7da57decc9db90a812b6f72ebb4c7050d6f8e66':
|
2013-04-10 19:41:07 -07:00 |
|
Tadashi G. Takaoka
|
ab99e6139b
|
am 8a984e8c : am 2b3f1289 : am 06c1baba : am b1533116 : am b08506c2 : am 9413e957 : Merge "Interpolate gesture preview trails"
* commit '8a984e8c4dc6006f1d802cd395143054e3b384b1':
|
2013-04-10 19:41:06 -07:00 |
|
Satoshi Kataoka
|
7d0d728ceb
|
am bc36fbfc : am cb4ae59c : am bb229fe1 : am 91d468f5 : am ac870326 : am 54c091d2 : Merge "Move policy and session to AOSP"
* commit 'bc36fbfc6ced487824ef364ec2af457a0c8ce543':
|
2013-04-10 19:41:05 -07:00 |
|
Jean Chalard
|
714b0044f1
|
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 '2cd99981bd2d20f252cf2bdf70d7b71bedc3669a':
|
2013-04-10 19:41:04 -07:00 |
|
Jean Chalard
|
d901066bf6
|
am f921a587 : am 76dda675 : am c821c723 : am 3b9d7fd1 : am 151e4e18 : am 065f126f : Merge "Fix two nasty bugs with surrogate pairs."
* commit 'f921a587842a5b1df59030e38e115e1b830b3164':
|
2013-04-10 19:41:03 -07:00 |
|
Satoshi Kataoka
|
8c485086f5
|
am 51805727 : am 8348fe8a : am 6f7494e6 : am fdf3c49c : am bde25a4a : am 38c26dd0 : Move dicnode to AOSP
* commit '5180572736145cc521fe375a5451bc2bd172dc1a':
|
2013-04-10 19:41:01 -07:00 |
|
The Android Open Source Project
|
aeb9680522
|
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 'cfe49191f7ee1d2b3fe17dd37898c625d563982c':
|
2013-04-10 19:41:00 -07:00 |
|
Satoshi Kataoka
|
51c0380fb6
|
am d7c3c523 : am 7a3bc77b : am b980adab : am a9ef902c : am 70747ad6 : am 97a3ce02 : Merge "Refactor"
* commit 'd7c3c523d920dc97a2c4fc3c9430a373f494fe21':
|
2013-04-10 19:40:59 -07:00 |
|
Jean Chalard
|
62e0ee324b
|
am c7163a4c : am 126336be : am 3effa520 : am 4c535232 : am a38d907b : am 740da0d8 : Fix an NPE
* commit 'c7163a4c8c373520fb8fa82011a366a1d98decea':
|
2013-04-10 19:40:57 -07:00 |
|
Tadashi G. Takaoka
|
05ed9c7631
|
am 617362fd : am 1b7451af : am 57a7a5c3 : am 76c00dec : am 7580e994 : am 48d8d8d0 : Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '617362fdb9d8480a4be301b2e6e1f6b355e0e1a3':
|
2013-04-10 19:40:56 -07:00 |
|
Jean Chalard
|
724e100eea
|
am 84b246f1 : am db993a5f : am ae97a93a : am 86b8b7b4 : am 9bf1dfeb : am 2188cbae : Merge "Fix an NPE"
* commit '84b246f147295ed4a2c1c95802b130842596e5a2':
|
2013-04-10 19:40:55 -07:00 |
|
Jean Chalard
|
1037300602
|
am 5c874a7b : am bb94c643 : am 5b248590 : am 1c63efc9 : am a657afc3 : am d555a0d7 : Merge "Cleanup"
* commit '5c874a7b58a8f7912315a935e8c5fe4d3fe0d973':
|
2013-04-10 19:40:53 -07:00 |
|