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 |
|
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 |