Kurt Partridge
|
a3837fd1a0
|
am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '4c74aaa09a093145c82b0264ae44ac11a0d5e78d':
|
2013-04-10 19:46:42 -07:00 |
Baligh Uddin
|
6a7f463975
|
am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '4a41a48fdb09077666859c9eab5320b49bbf7f11':
|
2013-04-10 19:46:40 -07:00 |
|
Baligh Uddin
|
6ff63273e7
|
am 166b3f98: (-s ours) 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 '166b3f98d8c608170dee0b06bff0a2a3f1d32984':
|
2013-04-10 19:46:39 -07:00 |
|
Kurt Partridge
|
3fcaa3e8b4
|
am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '1dc4a24f96912ee93409ffb418aa2b3bad3f5525':
|
2013-04-10 19:46:37 -07:00 |
Jean Chalard
|
feb16b6d4f
|
am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit 'b8a3454d1a9bd8297c2d4204b9a730702f5e5f9a':
|
2013-04-10 19:46:36 -07:00 |
Tadashi G. Takaoka
|
300d3bdee5
|
am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit 'ab99e6139b699ec05842ca4f0ec53471a39e4186':
|
2013-04-10 19:46:35 -07:00 |
Satoshi Kataoka
|
656900003c
|
am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit '7d0d728ceb157afc8ff7ed2dbbcd65f6f5d58491':
|
2013-04-10 19:46:33 -07:00 |
|
Jean Chalard
|
c14fdded82
|
am 714b0044: 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 '714b0044f12e976a10a7d7fe1dcd7498177fc131':
|
2013-04-10 19:46:32 -07:00 |
|
Jean Chalard
|
c26022cf59
|
am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit 'd901066bf6e0c977fbe9a20dd10bb1954744d4c6':
|
2013-04-10 19:46:30 -07:00 |
|
Satoshi Kataoka
|
d196cb6400
|
am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit '8c485086f54bd70b799aea158e9db1871762d198':
|
2013-04-10 19:46:29 -07:00 |
The Android Open Source Project
|
a0b2dc74fa
|
am aeb96805: (-s ours) 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 'aeb9680522c351e1f5ec1b7004953168a14805e0':
|
2013-04-10 19:46:28 -07:00 |
|
Satoshi Kataoka
|
b949db3856
|
am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit '51c0380fb639888cdc3562a939083c34ee8eeaef':
|
2013-04-10 19:46:26 -07:00 |
|
Jean Chalard
|
9a181179b2
|
am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '62e0ee324bb17540d37dd4f2e8f01b601e4e4da6':
|
2013-04-10 19:46:25 -07:00 |
|
Tadashi G. Takaoka
|
023ed8a661
|
am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '05ed9c763189536185e899ababd391c0bd56a9dd':
|
2013-04-10 19:46:24 -07:00 |
|
Jean Chalard
|
3f17ab4139
|
am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit '724e100eea715306e215d625cd73713d2d41e9c0':
|
2013-04-10 19:46:22 -07:00 |
|
Jean Chalard
|
0eb58dfe0c
|
am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '1037300602d8b310d1a91cc4e601b360db0620ea':
|
2013-04-10 19:46:21 -07:00 |
|
Baligh Uddin
|
faa708c326
|
am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '36583063a44c627b70a2494ee2a12879a0685cdb':
|
2013-04-10 19:46:20 -07:00 |
|
Baligh Uddin
|
dbf9168f86
|
am b3fbdd58: (-s ours) am f939332c: am 94065faf: 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 'b3fbdd58be95d65da36a270d4021fa65752f0ffa':
|
2013-04-10 19:46:19 -07:00 |
The Android Automerger
|
2cb2c00166
|
am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '6e6f705ecd972c34659577f0f1c4259bd727d2ab':
|
2013-04-10 19:46:17 -07:00 |
|
Tadashi G. Takaoka
|
19b5a10407
|
am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit 'ae3ead496271316515ad8d5409a4bc6041e5a303':
|
2013-04-10 19:46:16 -07:00 |
|
Tadashi G. Takaoka
|
6e53632195
|
am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit '31f350bcb3a399c865eeee057aeefd3678253832':
|
2013-04-10 19:46:14 -07:00 |
|
Satoshi Kataoka
|
5d1d7863d2
|
am 4b24e49b: am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit '4b24e49b11f8f47f59638cd54f1be8ffcf155126':
|
2013-04-10 19:46:13 -07:00 |
|
Tadashi G. Takaoka
|
47d68e5d5a
|
am 6ed9580f: am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '6ed9580fa38d153010db1e9a5f4e457a3497c2e3':
|
2013-04-10 19:46:12 -07:00 |
|
Baligh Uddin
|
32e8453151
|
am 8632fea5: (-s ours) am 88db1331: am 6626fb25: am 51c7dbea: (-s ours) am 4379dbea: am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit '8632fea5316fcdebcb50351204651e3a867800cb':
|
2013-04-10 19:46:10 -07:00 |
|
Baligh Uddin
|
0218ddb3d9
|
am 52d6480a: (-s ours) am f81c9132: am 1e8d1f41: am d72347f9: (-s ours) am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit '52d6480af129a866cf98de03d3ec6a0569f17412':
|
2013-04-10 19:46:09 -07:00 |
|
Baligh Uddin
|
dbd8eec733
|
am 643f8f08: (-s ours) am a3328255: am 38f2bbb3: am 210d473d: (-s ours) am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit '643f8f080e5786a66c58839b566612f69b711a09':
|
2013-04-10 19:46:07 -07:00 |
|
Tadashi G. Takaoka
|
b779b268df
|
am 6ed94c43: am 70252ecf: am 5eb7a00e: am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '6ed94c43a7135070060ec49d4e981e68a32af849':
|
2013-04-10 19:46:06 -07:00 |
|
Baligh Uddin
|
f3b1081525
|
am 0849b210: (-s ours) am 1cf0e85d: am 97687031: am 0ad31c8d: (-s ours) am a5bc58ac: am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit '0849b210345b4657e0d6a99f4abe8a6ce5752f06':
|
2013-04-10 19:46:05 -07:00 |
|
Baligh Uddin
|
a9a84c95f2
|
am 3d8f50ea: (-s ours) am 755db5bd: am 3a97d388: am 273a21ca: (-s ours) am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '3d8f50ea42d5b0b69d158a7502ee9d0da0957c8c':
|
2013-04-10 19:46:03 -07:00 |
|
Baligh Uddin
|
1a24764ed8
|
am 03fbe97c: (-s ours) am c46a975c: am 9f291d17: am 2f8e381b: (-s ours) am 92adcda6: am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '03fbe97cdb25e4af52eea72e4df22ff322b6d89c':
|
2013-04-10 19:46:02 -07:00 |
Alan Viverette
|
849c785807
|
am eff2ee76: am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit 'eff2ee76d858f7637bd0e11a8cf92000568f0191':
|
2013-04-10 19:46:00 -07:00 |
|
Satoshi Kataoka
|
cb132ce11d
|
am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '81295fd2b211b67d842a6994b2d37c1c7952de6c':
|
2013-04-10 19:45:59 -07:00 |
|
Tadashi G. Takaoka
|
3a2e78f9b5
|
am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit '30d9817bd00b924c3f5db091773b8d84523f8dc5':
|
2013-04-10 19:45:57 -07:00 |
|
Tadashi G. Takaoka
|
96d539237f
|
am 104923e4: 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 '104923e4716aef2bef6db14dceb8063cb1af2438':
|
2013-04-10 19:45:56 -07:00 |
|
Satoshi Kataoka
|
54f46879de
|
am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '1af04dc698e2352eb3fedd13369fd88e50936e2f':
|
2013-04-10 19:45:54 -07:00 |
|
Baligh Uddin
|
2060aa13e5
|
am 97046d19: 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 '97046d19844bc22414c510a1dac384eee27d924c':
|
2013-04-10 19:45:52 -07:00 |
|
Satoshi Kataoka
|
9e45f9e858
|
am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '24cf39e787858900988ca9697d6212cd62ef85a1':
|
2013-04-10 19:45:51 -07:00 |
|
Tadashi G. Takaoka
|
7bc7bd7997
|
am 59b23bcf: 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 '59b23bcfae2993a394045f12f17f5a4cbebc9f8c':
|
2013-04-10 19:45:49 -07:00 |
|
The Android Open Source Project
|
7db5bfa0fa
|
am 20995333: (-s ours) 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 '20995333067181fe68f5d325ca067d142d35a08e':
|
2013-04-10 19:45:47 -07:00 |
|
Alan Viverette
|
4b45830a21
|
am 7c9b7f24: 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 '7c9b7f249e48bbe130afdbceb9a501c704e6c74b':
|
2013-04-10 19:45:46 -07:00 |
|
Jean Chalard
|
186cf922f0
|
am 288deb7a: (-s ours) 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 '288deb7ab980dc37892b451206b653cbc24b2814':
|
2013-04-10 19:45:44 -07:00 |
|
Jean Chalard
|
2cef432317
|
am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit 'db3713a1b9e9b144ddb728bab0a1d4babd7b924a':
|
2013-04-10 19:45:43 -07:00 |
|
Baligh Uddin
|
e04cee4fe6
|
am 49201626: (-s ours) 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 '492016265c8d4eeff78656d57fa8b8cf5a43709e':
|
2013-04-10 19:45:41 -07:00 |
|
Baligh Uddin
|
3df28d1495
|
am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '14d778b27c79cc027ccc451514db9e2bd6ef9ab7':
|
2013-04-10 19:45:40 -07:00 |
|
Baligh Uddin
|
719e57293d
|
am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit 'e71516b290fb137d6b926df23fcc383866bdf069':
|
2013-04-10 19:45:38 -07:00 |
|
Satoshi Kataoka
|
5db288268b
|
am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'b3796ab2a7c66e8bcd6911bb1dc0fa8982f16d0a':
|
2013-04-10 19:45:37 -07:00 |
|
Satoshi Kataoka
|
71f828b12a
|
am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '9ff33b6dfa6641a5fe064624e07182db042df92f':
|
2013-04-10 19:45:35 -07:00 |
|
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 |