The Android Automerger
|
13ac43b3e6
|
am 2cb2c001: 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 '2cb2c001661383aa79f21992c4d783f2cb856c80':
|
2013-04-17 19:39:56 -07:00 |
|
Tadashi G. Takaoka
|
f6f20ab26b
|
am 19b5a104: 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 '19b5a10407838dd5f05bdca1663d6615313e131b':
|
2013-04-17 19:39:54 -07:00 |
|
Tadashi G. Takaoka
|
9a2c21bab9
|
am 6e536321: 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 '6e5363219506060390aabc79e60f7a280f5693a6':
|
2013-04-17 19:39:53 -07:00 |
|
Satoshi Kataoka
|
6a8da44f18
|
am 5d1d7863: 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 '5d1d7863d2834dd010ad9e077502a924a4f07f3b':
|
2013-04-17 19:39:51 -07:00 |
|
Tadashi G. Takaoka
|
b97fe38552
|
am 47d68e5d: am 6ed9580f: am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '47d68e5d5a308158d8a39f40bb8a43ff7a75e260':
|
2013-04-17 19:39:50 -07:00 |
|
Baligh Uddin
|
ce45384074
|
am 32e84531: 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 '32e84531511a214128c1340e4c7b9c1b5c825825':
|
2013-04-17 19:39:48 -07:00 |
|
Baligh Uddin
|
de5560e254
|
am 0218ddb3: 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 '0218ddb3d9b8bbe021df84c6560043243e2bcdc6':
|
2013-04-17 19:39:47 -07:00 |
|
Baligh Uddin
|
062a6c0255
|
am dbd8eec7: 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 'dbd8eec733fd8b35fd44b052cf1e0c05d8fdc068':
|
2013-04-17 19:39:45 -07:00 |
|
Tadashi G. Takaoka
|
2721db44ab
|
am b779b268: am 6ed94c43: am 70252ecf: am 5eb7a00e: am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit 'b779b268dfcbb304d27ac4cef41d03486f5ab69b':
|
2013-04-17 19:39:44 -07:00 |
|
Baligh Uddin
|
ac58dcf14e
|
am f3b10815: 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 'f3b10815250aa2088c0d3a75285c6e18bf84259a':
|
2013-04-17 19:39:42 -07:00 |
|
Baligh Uddin
|
58a4a153d1
|
am a9a84c95: 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 'a9a84c95f259a6771efe28b37447baba45fa6c42':
|
2013-04-17 19:39:41 -07:00 |
|
Baligh Uddin
|
b74cc3f96b
|
am 1a24764e: 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 '1a24764ed8a8e0c94fbaccd9ba06d0a1891476f0':
|
2013-04-17 19:39:39 -07:00 |
|
Alan Viverette
|
3de1ae1a6e
|
am 849c7858: 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 '849c785807ba536c6a26fbadc7f153f1747d76bc':
|
2013-04-17 19:39:37 -07:00 |
|
Satoshi Kataoka
|
775ef9bc38
|
am cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit 'cb132ce11df59be842f16ec69be16bd6316e234f':
|
2013-04-17 19:39:36 -07:00 |
|
Tadashi G. Takaoka
|
c0d71c3b49
|
am 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit '3a2e78f9b5b585b85a12283ed89bcec3376fdc32':
|
2013-04-17 19:39:35 -07:00 |
|
Tadashi G. Takaoka
|
18be37b079
|
am 96d53923: 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 '96d539237f22dd9d29a41bbdefd16978a148b442':
|
2013-04-17 19:39:33 -07:00 |
|
Satoshi Kataoka
|
9e78d2ba2c
|
am 54f46879: 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 '54f46879de606cb913888ddc419742c7a61d2108':
|
2013-04-17 19:39:32 -07:00 |
|
Baligh Uddin
|
15a357a30d
|
am 2060aa13: 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 '2060aa13e5f946950f788c383e5655c36167d062':
|
2013-04-17 19:39:30 -07:00 |
|
Satoshi Kataoka
|
e83747891d
|
am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '9e45f9e85807591b6484b4d96d5c6607d67bd755':
|
2013-04-17 19:39:28 -07:00 |
|
Tadashi G. Takaoka
|
fd06763b6a
|
am 7bc7bd79: 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 '7bc7bd79974bfccb437abc6cd4bab85d1aeb931b':
|
2013-04-17 19:39:27 -07:00 |
|
The Android Open Source Project
|
eb2fee1da6
|
am 7db5bfa0: 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 '7db5bfa0faf93f63dfc7e77c343799d07d886031':
|
2013-04-17 19:39:25 -07:00 |
|
Alan Viverette
|
79ef0a1708
|
am 4b45830a: 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 '4b45830a210b2eb61ebb3207234c9d848cb5b38b':
|
2013-04-17 19:39:24 -07:00 |
|
Jean Chalard
|
c5424013cf
|
am 186cf922: 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 '186cf922f0176078d49c8855256bc6b10be0a383':
|
2013-04-17 19:39:22 -07:00 |
|
Jean Chalard
|
5a59a9868a
|
am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '2cef432317c17c9382cd6f90812affb6283c8827':
|
2013-04-17 19:39:21 -07:00 |
|
Baligh Uddin
|
2d607977f4
|
am e04cee4f: 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 'e04cee4fe60626f2f0942c3e8892159629f3a845':
|
2013-04-17 19:39:19 -07:00 |
|
Baligh Uddin
|
ffb269b130
|
am 3df28d14: 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 '3df28d1495fdd3eaa90ac5a41624e112b5bd8a1a':
|
2013-04-17 19:39:18 -07:00 |
|
Baligh Uddin
|
bc1bc4d0cd
|
am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '719e57293d00cbe407c8953b40b2a17fe26e6a3a':
|
2013-04-17 19:39:16 -07:00 |
|
Satoshi Kataoka
|
7a4430ac4b
|
am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '5db288268b70ca0eb4e6faa67bfe5671530892d6':
|
2013-04-17 19:39:15 -07:00 |
|
Satoshi Kataoka
|
01eb9b2528
|
am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '71f828b12aa1fca16e8824c5ea44f61ebbc7f7d9':
|
2013-04-17 19:39:13 -07:00 |
|
Kurt Partridge
|
663660295b
|
am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit 'a6092dc8a55d2453a7746c296e3f21d4667b5e94':
|
2013-04-17 19:39:12 -07:00 |
|
The Android Open Source Project
|
cf0c1a7d6e
|
am 19289df5: 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 '19289df5e40acb355d52c47d6c27fd8e40407058':
|
2013-04-17 19:39:10 -07:00 |
|
The Android Open Source Project
|
faa9a5ecc7
|
am d9f9ba39: am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit 'd9f9ba395fe679d1f89e92ca2a28aa983117d4ea':
|
2013-04-17 19:39:09 -07:00 |
|
Baligh Uddin
|
bc5075e0da
|
am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit '536ec3bf58d8f30a5c2952b280536079f4311f1d':
|
2013-04-17 19:39:07 -07:00 |
|
Baligh Uddin
|
4d5ebdf53f
|
am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit 'f420e3bf9a381c48412e7de2f6a99024a54d9d8b':
|
2013-04-17 19:39:06 -07:00 |
|
Baligh Uddin
|
ea0d7ecd97
|
am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit '82c49d746d154551492ffec046442fc1021b5a49':
|
2013-04-17 19:39:04 -07:00 |
|
Satoshi Kataoka
|
b2230d9073
|
am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit '62f52e4fcee553b81a8b4e51162beb4fe527049a':
|
2013-04-17 19:39:03 -07:00 |
|
Jean-Baptiste Queru
|
67953e4da4
|
am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '626dd2a0ab4fff44a8e313101a908e4752aaf8d3':
|
2013-04-17 19:39:02 -07:00 |
|
Kurt Partridge
|
9cf3937281
|
am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
* commit '94c441a424875f815d7e84d02da5c8943ad6f7a6':
Preserve a class for testing
|
2013-04-17 19:39:00 -07:00 |
|
Tom Ouyang
|
e9de986d41
|
am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit 'f08c75f20cb9766141edf7e9b2715510f6da1fdc':
Add ability to handle digraphs in gesture and tap typing
|
2013-04-17 19:38:59 -07:00 |
|
Tom Ouyang
|
0ca76c94f5
|
am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit '38a9e5a5bf1a45e87db9a4b03f670cf402321d45':
Add mechanism to handle digraphs in DicNode
|
2013-04-17 19:38:58 -07:00 |
|
Kurt Partridge
|
6267ec688e
|
am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit '3e1f652c2c39351d306b3a930340948a46104de0':
Better release build reporting
|
2013-04-17 19:38:57 -07:00 |
|
Baligh Uddin
|
60ffda411f
|
am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERGE
* commit '5bbf4f302a131c58010101722719d97c11c350bc':
Import translations. DO NOT MERGE
|
2013-04-17 19:38:55 -07:00 |
|
Baligh Uddin
|
855b805312
|
am d86e14ae: Import translations. DO NOT MERGE
* commit 'd86e14aeba44d75651c75d56783f66c294b8f2b7':
Import translations. DO NOT MERGE
|
2013-04-17 19:38:52 -07:00 |
|
Jean Chalard
|
7503ef330c
|
am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
* commit 'cd51b80a0b31493ef9dce9b5283264399b305ba0':
Fix a bug where a space would not be inserted before a gesture
|
2013-04-17 19:38:51 -07:00 |
|
Tadashi G. Takaoka
|
c627f64274
|
am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit '9a6ff5dcef1a593260032b5e10eb801de297c0b2':
Use private object as a lock instead of synchronized method
|
2013-04-17 19:38:49 -07:00 |
|
Tadashi G. Takaoka
|
4516304436
|
am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit '1502d9779555958b0ca147fda1cab1e6302c9035':
Use private lock object instead of synchronized method
|
2013-04-17 19:38:48 -07:00 |
|
Tadashi G. Takaoka
|
8ea774ebf2
|
am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
* commit '14950497280f15b6d1de9e6c5d159ce46e27180b':
Protect simultaneously modifying gesture preview data
|
2013-04-17 19:38:46 -07:00 |
|
Jean Chalard
|
818b7d4686
|
am 80d7ed0b: am 4f430763: Fix a faulty test
* commit '80d7ed0bb8910fc85e5b5e68f287dc381511293f':
Fix a faulty test
|
2013-04-17 19:38:45 -07:00 |
|
Jean Chalard
|
99e91fc8ec
|
am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
* commit '2dd2e2d7dff8c4446d536bd23fc94a5538c24ddf':
Fix a bug where autocorrection status would be wrong.
|
2013-04-17 19:38:43 -07:00 |
|
Tadashi G. Takaoka
|
9a0f6ef847
|
am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
* commit 'c35bca685689ff6430e7a9393af64c74112bf677':
Don't override EXTRA_SHOW_FRAGMENT if exists
|
2013-04-17 19:38:41 -07:00 |
|