The Android Automerger
|
6e6f705ecd
|
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 'c82a56b427baa7edf0ce687af0f7591cbef77185':
|
2013-04-10 19:40:49 -07:00 |
|
Tadashi G. Takaoka
|
ae3ead4962
|
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 'faadc0a7cf059ec88f2c54b00a0812e978e6771b':
|
2013-04-10 19:40:48 -07:00 |
|
Tadashi G. Takaoka
|
31f350bcb3
|
am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit 'fc369029abf1ad80a852e9638a08de68ea646412':
|
2013-04-10 19:40:47 -07:00 |
|
Satoshi Kataoka
|
4b24e49b11
|
am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'a1cd79708f0b093de0f2c297e20e749bdcbad36c':
|
2013-04-10 19:40:46 -07:00 |
|
Tadashi G. Takaoka
|
6ed9580fa3
|
am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '098ecd550d3a888df2120264655eb2aa42e92d86':
|
2013-04-10 19:40:44 -07:00 |
|
Baligh Uddin
|
8632fea531
|
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 '88db1331582d0337aa5f1e12f3c8d5837aabbda7':
|
2013-04-10 19:40:43 -07:00 |
|
Baligh Uddin
|
52d6480af1
|
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 'f81c91326a3f762d60c7be015270abfee590d68f':
|
2013-04-10 19:40:42 -07:00 |
|
Baligh Uddin
|
643f8f080e
|
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 'a3328255291f019389bd685d0150b1a93d74b38c':
|
2013-04-10 19:40:40 -07:00 |
|
Tadashi G. Takaoka
|
6ed94c43a7
|
am 70252ecf: am 5eb7a00e: am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '70252ecff784303fbdda2cb9d813719d886279fd':
|
2013-04-10 19:40:39 -07:00 |
|
Baligh Uddin
|
0849b21034
|
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 '1cf0e85d25a3554e8ddd5c563e37e2caed794151':
|
2013-04-10 19:40:38 -07:00 |
|
Baligh Uddin
|
3d8f50ea42
|
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 '755db5bd3edd5758f906fde06f5fd4645fcce9cf':
|
2013-04-10 19:40:36 -07:00 |
|
Baligh Uddin
|
03fbe97cdb
|
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 'c46a975ce1a7618c8bdd27f025dd79b8cac29e60':
|
2013-04-10 19:40:35 -07:00 |
|
Alan Viverette
|
eff2ee76d8
|
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 '45b1a302cff21869db19c26b4b82919b279beeef':
|
2013-04-10 19:40:33 -07:00 |
|
Satoshi Kataoka
|
81295fd2b2
|
am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '119e6979846f7cd41f98f1feea7a5959e8c91314':
|
2013-04-10 19:40:32 -07:00 |
|
Tadashi G. Takaoka
|
30d9817bd0
|
am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit '7dcc22b66bc1b1e5d90d6d61ac20f0df4909fb9f':
|
2013-04-10 19:40:31 -07:00 |
|
Tadashi G. Takaoka
|
104923e471
|
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 '863d83ea27af1957a10fca4b42051a9fce399f10':
|
2013-04-10 19:40:29 -07:00 |
|
Satoshi Kataoka
|
1af04dc698
|
am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '249ad4d57ca477eb7a1ba28d6b0e5a505afa9a97':
|
2013-04-10 19:40:28 -07:00 |
|
Baligh Uddin
|
97046d1984
|
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 '1d024eca3f1d055da2977ad0725da203b8035c2e':
|
2013-04-10 19:40:26 -07:00 |
|
Satoshi Kataoka
|
24cf39e787
|
am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '894a8ffcfd76456da3390cd4d3348f0371801669':
|
2013-04-10 19:40:25 -07:00 |
|
Tadashi G. Takaoka
|
59b23bcfae
|
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 '680d689d859041a666a43a877da79161847f4535':
|
2013-04-10 19:40:24 -07:00 |
|
The Android Open Source Project
|
2099533306
|
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 '5d674b166d151813718e6bf591573947eb3cae9a':
|
2013-04-10 19:40:23 -07:00 |
|
Alan Viverette
|
7c9b7f249e
|
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 'e592be58095180558f18a36f7f42527a0af0e38a':
|
2013-04-10 19:40:21 -07:00 |
|
Jean Chalard
|
288deb7ab9
|
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 '11034c340a0b5fc294b69bb1c37e159255dd6ba5':
|
2013-04-10 19:40:20 -07:00 |
|
Jean Chalard
|
db3713a1b9
|
am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '9f9050d18fc3708badc6f906744d500458c70d36':
|
2013-04-10 19:40:18 -07:00 |
|
Baligh Uddin
|
492016265c
|
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 '0b758ec77fc14f768ddea0693e5d412086a591ef':
|
2013-04-10 19:40:17 -07:00 |
|
Baligh Uddin
|
14d778b27c
|
am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '3847aa30ae68a7e94daa484643ea68f16860d062':
|
2013-04-10 19:40:16 -07:00 |
|
Baligh Uddin
|
e71516b290
|
am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '5244d6378ce3df391ea855e8dbc87e5e648ea042':
|
2013-04-10 19:40:14 -07:00 |
|
Satoshi Kataoka
|
b3796ab2a7
|
am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '82a67bc8bbef7b9553d128f01e0813e63a3ac0ba':
|
2013-04-10 19:40:13 -07:00 |
|
Satoshi Kataoka
|
9ff33b6dfa
|
am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'd430c1b6bfccc11d272ca55894997e0c9efecb0d':
|
2013-04-10 19:40:12 -07:00 |
|
Kurt Partridge
|
504bbe38f7
|
am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '798820ab1d3c3da6b442f230a2c70ccb83f96ce3':
|
2013-04-10 19:40:10 -07:00 |
|
The Android Open Source Project
|
e279de0265
|
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 'ab6fa041587fcca7abd507f25bc07593074a97f2':
|
2013-04-10 19:40:09 -07:00 |
|
The Android Open Source Project
|
4b176a0104
|
am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '83346295ea6fcd4cf29fbe164bb2df76a6449dc9':
|
2013-04-10 19:40:08 -07:00 |
|
Baligh Uddin
|
b4fbb29551
|
am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'd3ae58ef1b18e015c4f2fe4b46c78eef7be02bb5':
|
2013-04-10 19:40:06 -07:00 |
|
Baligh Uddin
|
792abb730b
|
am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '3c163ec1732d00c9e726f22d27ef92057f685c04':
|
2013-04-10 19:40:05 -07:00 |
|
Baligh Uddin
|
c1f3a8012c
|
am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit '8acb56b60be5ad5009b7ffe96b035c067e03a958':
Import translations. DO NOT MERGE
|
2013-04-10 19:40:04 -07:00 |
|
Satoshi Kataoka
|
a514e95801
|
am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit 'a2b129e9ae369dae3001d2c0efe2b0746421930a':
|
2013-04-10 19:40:03 -07:00 |
|
Jean-Baptiste Queru
|
784eda74af
|
am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit 'd9f35e322681214ba62e1d89ec6fabfc7ff88c11':
|
2013-04-10 19:40:01 -07:00 |
|
Baligh Uddin
|
cfdc91b99a
|
am 58df3cfa: Import translations. DO NOT MERGE
* commit '58df3cfaeee020b6703f90feda89a3bc95a3a116':
Import translations. DO NOT MERGE
|
2013-04-10 19:35:52 -07:00 |
|
Tadashi G. Takaoka
|
9620943cc8
|
am d9a22235: Hide Setup Wizard icon for stock keyboard
* commit 'd9a2223570759d622c690b007369cf32f437f7e5':
Hide Setup Wizard icon for stock keyboard
|
2013-04-10 19:35:51 -07:00 |
|
Jean Chalard
|
1aaaa64da8
|
am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary."
* commit '75618c3321b8eae559886ba5f71e967591da7065':
Offer to add any OOV typed word to the dictionary.
|
2013-04-10 19:35:50 -07:00 |
|
Satoshi Kataoka
|
fd89cd20c9
|
am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration"
* commit 'daef4e8f194632a501270ea28c0ae8764a9fe97a':
Fix touch coordinate calibration
|
2013-04-10 19:35:49 -07:00 |
|
Jean Chalard
|
0d72a23054
|
am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"
* commit '04bb419c3290d059c5ccd5e1eda8600d44a0a69d':
Fix bugs and add tests
|
2013-04-10 19:35:48 -07:00 |
|
Kurt Partridge
|
bea42fc5bd
|
am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"
* commit '5bd2464297db3035b93410c5359accbda74e9f50':
Allow logging while replaying
|
2013-04-10 19:35:47 -07:00 |
|
Kurt Partridge
|
41a049a410
|
am ae144fe9: am d117c1a1: Merge "Do not record log split time when handling separator"
* commit 'ae144fe9c3a6c80150c11d96da84f5868f44ab8a':
Do not record log split time when handling separator
|
2013-04-10 19:35:45 -07:00 |
|
The Android Open Source Project
|
fb899d85ee
|
am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge
* commit '3019a5e1d11eca0d9a8396cf6684f72767eb6d6e':
|
2013-04-10 19:35:45 -07:00 |
|
Ken Wakasa
|
4c896a2fe8
|
am f71b9640: am d17c8bd9: Update comments
* commit 'f71b96406391fc00c1d3dc45e6b3e827f3595842':
Update comments
|
2013-04-10 19:35:44 -07:00 |
|
Ken Wakasa
|
b3cf23de7f
|
am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit 'a271f165b92069a7684a1dfc2c43533dc79fccdd':
Tiny clean up in Makefile
|
2013-04-10 19:35:42 -07:00 |
|
Ken Wakasa
|
ff730a665c
|
am bc2fd24f: am b68e7344: Cleanup the include paths
* commit 'bc2fd24fd3dff57295a1ba4d80d06544e54a820c':
Cleanup the include paths
|
2013-04-10 19:35:41 -07:00 |
|
Satoshi Kataoka
|
c7e1caac44
|
am cd0984a4: am e320789a: Suppress bigram native log
* commit 'cd0984a4ab8f95d40287bb1e450ef169513330df':
Suppress bigram native log
|
2013-04-10 19:35:39 -07:00 |
|
Satoshi Kataoka
|
40d8b652b2
|
am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"
* commit 'dfb680c4650d527f22046f6924f404eaba56709a':
Cleanup suggest interface
|
2013-04-10 19:35:38 -07:00 |
|