The Android Automerger
|
f4ed91f54d
|
am 8435a9b8: am abaea38f: am 13ac43b3: 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 '8435a9b8ac5a1272d844ebc5bd445f76212fd0fd':
|
2013-05-15 10:38:43 -07:00 |
|
Tadashi G. Takaoka
|
35c4a83411
|
am 52a89e5a: am c7420082: am f6f20ab2: 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 '52a89e5adf201cd559b02ce1708065ecaafcf41c':
|
2013-05-15 10:38:41 -07:00 |
|
Tadashi G. Takaoka
|
593432e167
|
am e5561f52: am 707d7d03: am 9a2c21ba: 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 'e5561f52418d4d26e3b0bad0552b48062e7d9010':
|
2013-05-15 10:38:38 -07:00 |
|
Satoshi Kataoka
|
4b2cd41350
|
am ef6e62dd: am 1ca78739: am 6a8da44f: 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 'ef6e62dd751b50c5c46fd5222600b99ab64a1ffc':
|
2013-05-15 10:38:36 -07:00 |
|
Tadashi G. Takaoka
|
1e02d2ccef
|
am 398c6862: am 8c897819: am b97fe385: 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 '398c686243107ce5eb56b2ecb94ddb14b753eb00':
|
2013-05-15 10:38:35 -07:00 |
|
Baligh Uddin
|
608d77a1d9
|
am 352e94b0: am 13f39210: am ce453840: 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:
* commit '352e94b016db3ecf3e9b6c16708ccb45f04e8ad9':
|
2013-05-15 10:38:33 -07:00 |
|
Baligh Uddin
|
32e5224a3c
|
am 33a9c2b2: am c346b2dc: (-s ours) am de5560e2: 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 NO
* commit '33a9c2b26adb479ade42f25eb38f2750767df624':
|
2013-05-15 10:38:31 -07:00 |
|
Baligh Uddin
|
db9dbeee8e
|
am 8f89ca1d: am b233e047: (-s ours) am 062a6c02: 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 '8f89ca1d2586d338888b55d99d607c6a7e7976f4':
|
2013-05-15 10:38:29 -07:00 |
|
Tadashi G. Takaoka
|
2a4ab01198
|
am b53d753d: am d88350e2: am 2721db44: 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 'b53d753dcf0c28a0d82a2377eedf88612240d423':
|
2013-05-15 10:38:27 -07:00 |
|
Baligh Uddin
|
a13080d655
|
am aa52681b: am 627db009: am ac58dcf1: 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:
* commit 'aa52681bfc215c9d3829980fac5c07841217a4db':
|
2013-05-15 10:38:24 -07:00 |
|
Baligh Uddin
|
0b6762a1eb
|
am 719f8865: am 2b19100a: (-s ours) am 58a4a153: 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
* commit '719f8865fd146b0a4b592a78d197ec80650db370':
|
2013-05-15 10:38:23 -07:00 |
|
Baligh Uddin
|
768c3c659a
|
am dff9a646: am 87ad4a8c: (-s ours) am b74cc3f9: 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. D
* commit 'dff9a64655f8eedd6ee8ac5dc8e94e0856c2d7bf':
|
2013-05-15 10:38:21 -07:00 |
|
Alan Viverette
|
28a831de82
|
am c795a288: am 69ef660f: am 3de1ae1a: 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 'c795a288b375af72709b0d07d74338c5502c6c7c':
|
2013-05-15 10:38:19 -07:00 |
|
Satoshi Kataoka
|
04708a3216
|
am d1935d05: am d0642a34: am 775ef9bc: 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 'd1935d05483e71610146eedb54074406178ea916':
|
2013-05-15 10:38:17 -07:00 |
|
Tadashi G. Takaoka
|
bfb1855908
|
am 37232a10: am 58db8c60: am c0d71c3b: 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 '37232a10d27fe87fac16271c3ce6e91df5d77e6a':
|
2013-05-15 10:38:15 -07:00 |
|
Tadashi G. Takaoka
|
9faf1961bf
|
am c1e417dd: am e010bb8a: am 18be37b0: 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 'c1e417dd2b2ca0046f9c0202ab5d06445bbe6b90':
|
2013-05-15 10:38:13 -07:00 |
|
Satoshi Kataoka
|
eecbcea7a9
|
am 4bb35fea: am 8e8ea448: am 9e78d2ba: 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 '4bb35fea2db5b34dd95f58c756a8dd6331ced17d':
|
2013-05-15 10:38:11 -07:00 |
|
Baligh Uddin
|
af1ca4138a
|
am daad9c68: am 5bc76be0: am 15a357a3: 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\' in
* commit 'daad9c687ed5857588bade9b71c8e2b74e1b605e':
|
2013-05-15 10:38:09 -07:00 |
|
Satoshi Kataoka
|
29370f4150
|
am 204243c3: am 071c3c6d: am e8374789: 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 '204243c3e11d1c1933ee146a7bb511230ce226c9':
|
2013-05-15 10:38:07 -07:00 |
|
Tadashi G. Takaoka
|
217fe8773b
|
am eeb0459e: am a446f8f7: am fd06763b: 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 'eeb0459e68d6c9a8654d3fd76561814c4dbb2399':
|
2013-05-15 10:38:05 -07:00 |
|
The Android Open Source Project
|
be7561c240
|
am 41b61150: am adef73a7: am eb2fee1d: 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 wit
* commit '41b61150d0a395bc466361099a841ab187b80859':
|
2013-05-15 10:38:03 -07:00 |
|
Alan Viverette
|
77deeefe8e
|
am 3694cc82: am e4f98a02: am 79ef0a17: 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 '3694cc826a239e9860a7e57adaf76b494f4df9bd':
|
2013-05-15 10:38:01 -07:00 |
|
Jean Chalard
|
efd853284b
|
am c825c557: am b2af86cf: (-s ours) am c5424013: 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" int
* commit 'c825c55779455e17ca85e526b9c5ed8ad95dd60b':
|
2013-05-15 10:37:59 -07:00 |
|
Jean Chalard
|
dd0e671af3
|
am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '30439651658d0c676f650b38ae92ea8553712f21':
|
2013-05-15 10:37:57 -07:00 |
|
Baligh Uddin
|
6da2f050df
|
am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: 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 '79971a1f25f258a1fa5f0e8dd89dc7a73e74a4b7':
|
2013-05-15 10:37:55 -07:00 |
|
Baligh Uddin
|
6686f6eeb0
|
am ea151032: am 4d085cfa: (-s ours) am ffb269b1: 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 'ea1510321df75995233477469f5021e8cd09d359':
|
2013-05-15 10:37:52 -07:00 |
|
Baligh Uddin
|
4c2b9e46d7
|
am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit 'e0789c736becc6be61c3edcb995bcb19240ff248':
|
2013-05-15 10:37:49 -07:00 |
|
Satoshi Kataoka
|
9da909d187
|
am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'dcfff5c0d28345891f3324f29d0edaa92c03fb2d':
|
2013-05-15 10:37:46 -07:00 |
|
Satoshi Kataoka
|
f368fdb6d5
|
am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '3d82dbcaaef28d3ac201d8c5d312110aa4898280':
|
2013-05-15 10:37:44 -07:00 |
|
Kurt Partridge
|
c68eb70ae2
|
am 023bee60: am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '023bee608b5695715394f1ff2f433612f16efc85':
|
2013-05-15 10:37:42 -07:00 |
|
The Android Open Source Project
|
37f22676b0
|
am b241b243: am 740243cb: (-s ours) am cf0c1a7d: 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 'b241b243c893810461dd6da004e323dcea386d38':
|
2013-05-15 10:37:40 -07:00 |
|
The Android Open Source Project
|
3f0311128a
|
am 3675b5bb: am 1996320a: (-s ours) am faa9a5ec: 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 '3675b5bb967ec9683f5fc7cdbb61a9e87c3cd3c8':
|
2013-05-15 10:37:38 -07:00 |
|
Baligh Uddin
|
d28727d92b
|
am 480ebe79: am 403354ba: (-s ours) am bc5075e0: am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit '480ebe7969ac6d9c19d1c6489128ddc7a93802b6':
|
2013-05-15 10:37:36 -07:00 |
|
Baligh Uddin
|
d31b88ab17
|
am 7c9a29d5: am 2c71e826: (-s ours) am 4d5ebdf5: am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '7c9a29d578fe2651620733fe9036485c2c292430':
|
2013-05-15 10:37:34 -07:00 |
|
Baligh Uddin
|
097dee9d42
|
am dd3aa373: am 9f2573e4: (-s ours) am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit 'dd3aa3732131a17defff7b27220bd11b294d283b':
|
2013-05-15 10:37:32 -07:00 |
|
Satoshi Kataoka
|
659774af10
|
am 24c86a66: am 4c767c81: am b2230d90: am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit '24c86a666d832416f36f16de912e465f67c62c72':
|
2013-05-15 10:37:30 -07:00 |
|
Jean-Baptiste Queru
|
d535416e62
|
am 68dcdeed: am 6e5857cb: (-s ours) am 67953e4d: am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '68dcdeed72c9c2c5273bd488eff830fc2feec839':
|
2013-05-15 10:37:28 -07:00 |
|
Kurt Partridge
|
e64ec6e1ac
|
am fb4da969: am 89ccc962: am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
* commit 'fb4da9692bfa749d245d9e558800ee6d573af230':
|
2013-05-15 10:37:26 -07:00 |
|
Tom Ouyang
|
607c566cde
|
am bcefab0c: am 44eabffc: am e9de986d: am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit 'bcefab0cb94c1c2ca17a2dc4a231e4c12f09696a':
|
2013-05-15 10:37:24 -07:00 |
|
Tom Ouyang
|
94e209c5df
|
am 0fe18452: am 0de0fa3b: am 0ca76c94: am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit '0fe18452df5e666d568ba0dd7b4b050b09d0e9a9':
|
2013-05-15 10:37:22 -07:00 |
|
Kurt Partridge
|
07cc9c0793
|
am d40d2f35: am eba670d0: am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit 'd40d2f3536eb50d8e5d5d6e7378fb2283b438aad':
|
2013-05-15 10:37:20 -07:00 |
|
Baligh Uddin
|
98fa49d5e0
|
am 265eed2b: am 7c0257ae: (-s ours) am 60ffda41: am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERGE
* commit '265eed2bca109f47ef704c9c10465e449a4ad77d':
|
2013-05-15 10:37:18 -07:00 |
|
Baligh Uddin
|
879d9c284d
|
am 93e873cf: am b155cedc: (-s ours) am 855b8053: am d86e14ae: Import translations. DO NOT MERGE
* commit '93e873cf715e21f7dfb3821f05dd86dbed8cab46':
|
2013-05-15 10:37:16 -07:00 |
|
Jean Chalard
|
cbecd375a9
|
am 56e03dd3: am 9129c0d1: am 7503ef33: am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
* commit '56e03dd3517ae8cb5d39cb85f6feb477d6311f0f':
|
2013-05-15 10:37:14 -07:00 |
|
Tadashi G. Takaoka
|
8d38f57449
|
am 7d4f0961: am ef2d1555: am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit '7d4f0961d4078d5baada0b3a22205f8b786fd516':
|
2013-05-15 10:37:12 -07:00 |
|
Tadashi G. Takaoka
|
6fe0a646f3
|
am 38af721f: am 44905316: am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit '38af721f108c4b409efa6f373c46baeb6b15ff0d':
|
2013-05-15 10:37:10 -07:00 |
|
Tadashi G. Takaoka
|
869aebcc34
|
am 45a1fbd4: am 70a79ee6: am 8ea774eb: am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
* commit '45a1fbd488c30c71c8d7e3d18df09db6f43e0c3c':
|
2013-05-15 10:37:08 -07:00 |
|
Jean Chalard
|
4168d0b502
|
am 1792b892: am f514024a: am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
* commit '1792b8925f287fca9da24527c08e61ca9c98018d':
|
2013-05-15 10:37:06 -07:00 |
|
Jean Chalard
|
e40d883f99
|
am 0cfbc7c6: am 8e7e9df1: am 99e91fc8: am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
* commit '0cfbc7c67c48ad4691f609db7b2969e8c4a1d809':
|
2013-05-15 10:37:04 -07:00 |
|
Tadashi G. Takaoka
|
6de62a6be6
|
am b3f31ea6: am 21dd8537: am 9a0f6ef8: am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
* commit 'b3f31ea66ab656c79560e608de909b07755b3e5f':
|
2013-05-15 10:37:03 -07:00 |
|