7b94f85acc
am 6460cc71: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '6460cc71cde6db3488805ffa0703343ec1d19d0a':
Import translations. DO NOT MERGE
2013-10-03 10:15:56 -07:00
b17084a462
am 0f75a055: am 431158c9: Turn off emoji palette on JB-MR2
...
* commit '0f75a055bcb2503e6efc4a5b3be1404e0a30ff1a':
Turn off emoji palette on JB-MR2
2013-10-03 10:15:51 -07:00
0693c6d2ff
am d484b1f4: (-s ours) am 46fdc6fd: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'd484b1f4a23015b166cc19b6007264a8e760d062':
Import translations. DO NOT MERGE
2013-10-03 10:15:49 -07:00
3576e1029d
am 0f6eca4a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '0f6eca4af41c6d5646732b5c713e114fd37f0d86':
Import translations. DO NOT MERGE
2013-10-03 10:15:46 -07:00
847fdcf708
am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit '2f14418c3176caa09d646d95e5556c11e3b86549':
2013-10-01 22:22:04 -07:00
2913ce4141
am a0c9846f: am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'a0c9846fb99b65a6a4a578eba38f3d4b66056fed':
2013-10-01 22:22:03 -07:00
83d1648b2c
am cecb793f: am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'cecb793ff36539f5938db764cad73d88fa399192':
2013-10-01 22:22:02 -07:00
1e113c1325
am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac':
Use reentrant lock for main dictionaries. DO NOT MERGE
2013-10-01 05:23:17 -07:00
1ef00b28a5
am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1':
Fix PrioritizedSerialExecutor.
2013-10-01 05:23:13 -07:00
3b3cb4fe56
am ef63947f: Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'ef63947f7d10bcbb3237661ad480b430d4208833':
Add boundary checking for PtNode Array reading. DO NOT MERGE
2013-10-01 05:23:12 -07:00
2f14418c31
am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
...
* commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac':
Use reentrant lock for main dictionaries. DO NOT MERGE
2013-09-30 18:02:52 -07:00
a0c9846fb9
am ceb364c0: Fix PrioritizedSerialExecutor.
...
* commit 'ceb364c0411dbcb38f2bd94f1d2b54eef3b985c1':
Fix PrioritizedSerialExecutor.
2013-09-30 18:02:49 -07:00
cecb793ff3
am ef63947f: (-s ours) Add boundary checking for PtNode Array reading. DO NOT MERGE
...
* commit 'ef63947f7d10bcbb3237661ad480b430d4208833':
Add boundary checking for PtNode Array reading. DO NOT MERGE
2013-09-30 18:02:48 -07:00
dd8ea0a33a
am 10fa6a2e: Stop reading dictionary while regenerating. (DO NOT MERGE)
...
* commit '10fa6a2e51ff29b81ffaf33d6bc4e3d78bae83e6':
Stop reading dictionary while regenerating. (DO NOT MERGE)
2013-09-30 17:07:55 -07:00
e628cd3c32
Use reentrant lock for main dictionaries. DO NOT MERGE
...
cherrypick of Iaa9b79fc770d8ae2ec9d7c362c90c28bc9f65ea8
Bug: 10964805
Change-Id: Id5e67b00bf9594be0591c87407a78146297e0e78
2013-10-01 02:15:05 +09:00
ceb364c041
Fix PrioritizedSerialExecutor.
...
It was possible that fetchNextTasks() would be called by multiple
threads concurrently.
If it happens, some tasks in the task queues might be ignored.
cherrypick of Idc81c43c45e382da3850cc55b9a42c281548d2a8
bug: 10957075
Change-Id: I41bf90dda15306ee879350f96a791d940ea31da1
2013-09-29 11:41:13 +09:00
ef63947f7d
Add boundary checking for PtNode Array reading. DO NOT MERGE
...
cheery-pick of Iea5e19d98d2fc26f137046dd5f8e339239672351
Bug: 10957075
Change-Id: I3f1806c32fe480f2e7422d3a945932b9cc0cd98b
2013-09-29 11:39:09 +09:00
10fa6a2e51
Stop reading dictionary while regenerating. (DO NOT MERGE)
...
Cherrypick of Iead7268a9371b48d729a5f65074ccbc05f3185db
Bug: 10831272
Change-Id: Ib6f314ac68696616532ff9c05c7f35813137bf9f
2013-09-28 00:36:39 +09:00
983b4866ef
am 16a6f173: am 0c05b276: am 58c53964: am dbca9c71: am 9cfe2a8a: am c3c7712f: am a6ec455e: am f67e7488: am ed19c005: am ddb50fff: am d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '16a6f173b02439c3f7d830a45a1f29e340f5d4a4':
2013-09-26 06:26:59 -07:00
9c5305dc30
am 9240d91d: am 01dbd80d: am c451a852: am 96d4f1dc: am a069e8d9: am d981caa7: am e8675585: am 2d6305ca: am 4d21e347: am edf26bee: am d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
...
* commit '9240d91d870810a212eea5522982d6af35e523d0':
2013-09-26 06:26:54 -07:00
d5e72d74fb
am 24c5560e: am beac5760: am ffcbb571: am 11aebd5a: am 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
...
* commit '24c5560e69d3343c22eea9a399af1240d942fb4b':
2013-09-26 06:26:48 -07:00
2ddb9422fc
am 51be4eaf: am 4f9767aa: am 9a4b776d: am 4c8d527f: am 148e15a9: am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
...
* commit '51be4eaf1b6c966bb473e168081b8325dec467e1':
2013-09-26 06:26:43 -07:00
1e11b6fd8c
am e8d9afc5: am 01ce6e7e: (-s ours) am 1b9de8c5: (-s ours) am d9508378: (-s ours) am 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Rev
...
* commit 'e8d9afc580d36e4db0f47e9d62940c9f51bfef7c':
2013-09-26 06:26:38 -07:00
5fa0e86674
am 2a15c64f: am d1b59b4e: (-s ours) am f1aae28e: (-s ours) am b7519526: (-s ours) am a2ccaa57: am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO
...
* commit '2a15c64fbb655f10c6567cd19d56b0a10a6c9ff6':
2013-09-26 06:26:33 -07:00
21d6a1eb92
am c5b6fe56: am 747d95ef: am d804cb42: am 033792b6: am a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
...
* commit 'c5b6fe569c1aa615e74f67fccd414d96b67b3bf3':
2013-09-26 06:26:28 -07:00
0995977c10
am 9b82e15d: am 9dcd2956: am 6e6e87d5: (-s ours) am bcf54a1e: (-s ours) am 7d5a1369: am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import
...
* commit '9b82e15d8c64add727561a965bc0ed08fcfc79c5':
2013-09-26 06:26:23 -07:00
3455f2bc5a
am a0a2b9c3: am 34e2eb25: am 4adf7c44: (-s ours) am 87156ef4: (-s ours) am 214d5b2c: am 6f4025d6: (-s ours) am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations
...
* commit 'a0a2b9c3b6379b8e0a595fd20370955e6c36ac83':
2013-09-26 06:26:17 -07:00
06917b2f05
am 2e70142a: am 1260923e: am 164e681f: am c9b193c1: am fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
...
* commit '2e70142ae863a62b65bd9d1363373524e767ec38':
2013-09-26 06:26:12 -07:00
4b6c72a0bb
am 2acd9fcd: am 44800b31: am a05f6c1c: am 2d03ab45: am c633b61e: am dbb031c7: am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
...
* commit '2acd9fcd6f80d0f85b0a2b60ae7b15d15df16f5e':
2013-09-26 06:26:07 -07:00
855aa95e92
am eda828fc: am 77dd85d9: am ea6db9ac: am 254cb1ff: am d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
...
* commit 'eda828fc53181200b453ae08ac944fdccc2086bb':
2013-09-26 06:26:01 -07:00
f067287e93
am 9feb95cd: am 718b9f3d: am 053e4ac9: am e406c316: am 85cb23c4: am a08620f1: am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
...
* commit '9feb95cd6aa1411b1d150357c8ddcc74fb73f416':
2013-09-26 06:25:56 -07:00
f47c332538
am e1500eda: am bc599f8a: am 42b7bad5: am 114e9c56: am 0eb45d7f: am 484e9144: am e29ffdb6: am c14fdded: 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 'e1500edae6bc0cd76411b8dc7ae2e59ae8a502f4':
2013-09-26 06:25:49 -07:00
19bf433578
am 4ab974c1: am a034f847: am ef9ab1c6: am 00f46f03: am 174ddfd4: am 472f764f: am 267e6179: am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
...
* commit '4ab974c154ad39ffecb9c9c4d03d3e8d30b23e68':
2013-09-26 06:25:44 -07:00
110d360c68
am 693aaa0f: am fe92ae2d: am 817a43a9: am 94eeba65: am 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
...
* commit '693aaa0febccd454f7cdd49121e7f3eaebac9ea5':
2013-09-26 06:25:39 -07:00
fb02270d6a
am 569ca6b5: am 6c21cf51: am 7a43a60d: am 6e804061: (-s ours) am 7c4dff90: am 892fcbfb: (-s ours) am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours)
...
* commit '569ca6b5badad737cda62c50aae028205e444c5d':
2013-09-26 06:25:34 -07:00
9903f41904
am 6f9d9e9b: am 27add2a2: am 175d4e55: am a7885e52: am 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
...
* commit '6f9d9e9bb734051e3d3bd7301a6a6957b0624b40':
2013-09-26 06:25:27 -07:00
c900edce81
am d9a298f4: am d2564cea: am a1ff71f0: am 840a0695: am 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
...
* commit 'd9a298f41b262e09f390394280f505830751dbf2':
2013-09-26 06:25:17 -07:00
4986c09541
am 31965739: am 960a13fe: am 08898684: am 2bc1809d: am e878a277: am a1b05608: am c01de725: am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
...
* commit '31965739ea3b890fd6764344690ac91a1f9b0289':
2013-09-26 06:25:12 -07:00
8e6d5fb0c2
am 54692476: am ff6f8561: am 615c8b66: am 60368456: am 720ce530: am 9477d7b3: am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
...
* commit '54692476ebeea9f86d62e64c1b934496a28e4c3a':
2013-09-26 06:25:07 -07:00
ded29a89eb
am 2a4a2dcf: am 00f378d6: am 6571290c: am 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
...
* commit '2a4a2dcf6b868d18514b633dff37d2b344e615f3':
2013-09-26 06:21:47 -07:00
29ac8dd8a8
am 3710ff0e: am d6f1fba4: am 0151b947: am 61076e10: am 04ef4141: am 42f36bb6: am 2456eb3a: am faa708c3: 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-latinimegoogl
...
* commit '3710ff0e9125a82fd02ecab6d309606b71eb978e':
2013-09-26 06:21:41 -07:00
d403a860c2
am 41236d61: am 2f1f1df4: am f61619af: am 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) am f205c258: am dbf9168f: 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 c08b824
...
* commit '41236d61e3d172c7f51fd46aff5a591b2c940ffc':
2013-09-26 06:21:36 -07:00
6f6db1de7d
am 6548fea2: am 0de714bf: am 1e944609: am f4ed91f5: 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 aft
...
* commit '6548fea280342aca38e13e23115c019cd848d8ae':
2013-09-26 06:21:32 -07:00
5bab3b1aea
am f6073bf0: am d727baf8: am 47846109: am 35c4a834: 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\'
...
* commit 'f6073bf07f4925595a872e86095ac7eab35bce30':
2013-09-26 06:21:21 -07:00
8e1fb94f9a
am 05cede19: am d1c14f6b: am 751cce8d: am 593432e1: 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.getEventT
...
* commit '05cede19f507f932ba6c379554c5d3babc80b6db':
2013-09-26 06:21:16 -07:00
36e702d4c4
am e8b16e6f: am b053083f: am bbc44915: am 4b2cd413: 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 'e8b16e6fd81b7bcd7bedcdb3666cc35198d5daf3':
2013-09-26 06:21:11 -07:00
88b30760b0
am 3a4895f7: am 2a574e0f: am 719e23e1: am 1e02d2cc: 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 '3a4895f78e3ce777f011be4a07a1b8f9e0da4661':
2013-09-26 06:21:06 -07:00
ec32c11610
am 549261fc: am e0a48595: am 38a9550b: am 608d77a1: 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 5f97
...
* commit '549261fca36576a3b0a3dceead6e5570bd86221c':
2013-09-26 06:21:01 -07:00
37dfb8d795
am 33226450: am 1ccedccf: am a7e31631: am 32e5224a: 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 24daa2a
...
* commit '332264502aac7c14d3f0c47cfe406cff703d047e':
2013-09-26 06:20:56 -07:00
067bc055f0
am 845818b8: am 9c981de6: am e83fc873: am db9dbeee: (-s ours) 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)
...
* commit '845818b8ad8cfd97599d8438c28ef40e7ca289c4':
2013-09-26 06:20:51 -07:00
Baligh Uddin
Satoshi Kataoka
Keisuke Kuroyanagi
Yuichiro Hanada
The Android Automerger
Jean Chalard
Kurt Partridge
Tadashi G. Takaoka
The Android Open Source Project