Commit graph

14194 commits

Author SHA1 Message Date
Kurt Partridge
d7ab90eb43 am c922e674: am d01cce40: am 021cf23f: am 5df602b0: am 1944521b: am 41a049a4: am ae144fe9: am d117c1a1: Merge "Do not record log split time when handling separator"
* commit 'c922e67463f2db9f832f84da59452d9ffb91bc72':
2013-05-15 10:40:02 -07:00
The Android Open Source Project
24051f14c8 am a2319920: am d31bb0b2: (-s ours) am 5761746e: am 3d399706: am c89354b9: (-s ours) am fb899d85: am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge
* commit 'a2319920be9a69c3392bc72ee5e063b0443672dd':
2013-05-15 10:40:00 -07:00
Ken Wakasa
00c01f78f8 am 0c61a0a0: am afdeefb5: am e295aee8: am b1f51ca0: am d01118ae: am 4c896a2f: am f71b9640: am d17c8bd9: Update comments
* commit '0c61a0a0967d382c345f67c52bfa511b14814d93':
2013-05-15 10:39:59 -07:00
Ken Wakasa
e191316ace am cef20a89: am 3d85683a: am 14eb5e37: am 42eafd44: am 3f55a951: am b3cf23de: am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit 'cef20a89d8cf45c21cdfcac31682d8c8ea6453d3':
2013-05-15 10:39:57 -07:00
Ken Wakasa
79f076199c am 3c08c17f: am 9b83250e: am 70a66271: am b0a7c47d: am e4d60a2d: am ff730a66: am bc2fd24f: am b68e7344: Cleanup the include paths
* commit '3c08c17fa815dc952970da373a3855113528b97b':
2013-05-15 10:39:55 -07:00
Satoshi Kataoka
98a90cf164 am 8e3586df: am 8ff8b9c5: am 285de8bb: am a6e4ff7a: am c7d4f502: am c7e1caac: am cd0984a4: am e320789a: Suppress bigram native log
* commit '8e3586df99482d415e52ab2a4850053cc2748337':
2013-05-15 10:39:53 -07:00
Satoshi Kataoka
f89e74a76d am 9cc79ba5: am 79305b2e: am eb8ecdc3: am f17c4e65: am 23b62c93: am 40d8b652: am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"
* commit '9cc79ba5c89bcc4d0c9789fd14986cee9a795a48':
2013-05-15 10:39:52 -07:00
Ken Wakasa
7c7640f132 am 3ba4425b: am e4a8b944: am e950a617: am b66b928a: am 1c9da7af: am 34cff46a: am ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings
* commit '3ba4425b73faa19a00aef96fbede9f3bbd58d9ae':
2013-05-15 10:39:50 -07:00
Jean Chalard
9ae79c3609 am 26acfcfb: am 13b555f1: am a52de59a: am e4678cf9: am 81782419: am 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils"
* commit '26acfcfb57dca1a3aaff9128ffb8f81f35572e8a':
2013-05-15 10:39:48 -07:00
Tom Ouyang
88bf50a83e am 8aa5cab8: am 5dbfba7c: am b9ae8670: am 281b22bf: am 3c15067b: am 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class"
* commit '8aa5cab84377ae8fffdd5ddfb37b83eca3e73c5a':
2013-05-15 10:39:46 -07:00
Ben Cheng
9804810de4 am 864c241f: am 6d9e0bb3: am 3c547048: am 49273f43: am 76293949: am f82a5a24: am 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
* commit '864c241f3edb27214373dbdb988754251259d9d3':
2013-05-15 10:39:44 -07:00
Satoshi Kataoka
ea82b21d02 am 79dbeb1c: am 67a53798: am d8c1aaf1: am c086c111: am b3d7d07e: am e90df243: am 481412bb: am f3633e9b: Merge "Add flag to turn on new suggest implementation for typing"
* commit '79dbeb1c66c2e65a320228dbd4fa50731e16642f':
2013-05-15 10:39:43 -07:00
Baligh Uddin
94558219b9 am 18fd43fc: am 00f6c270: am 351ddb5a: am 90044aab: am 1270880e: am da90ffe0: am 898ec2bf: am 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '18fd43fcb982c4bef96708d39ec59dc2b62c71e4':
2013-05-15 10:39:41 -07:00
Baligh Uddin
d75db06d64 am a4c7b28d: am e0b4b47a: (-s ours) am a276336e: am 2cd45944: am 83c5ec6b: (-s ours) am 005df808: am 12db86a6: am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NOT MERGE
* commit 'a4c7b28de1275d1dbcc0c219e6acdbff36747605':
2013-05-15 10:39:39 -07:00
The Android Automerger
dbca9c719f 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 '9cfe2a8aa8b77a64930522c750a21e6e7ca70e38':
2013-05-15 10:39:38 -07:00
Jean Chalard
96d4f1dc18 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 'a069e8d98861559428120e479dcbb1d95e89169f':
2013-05-15 10:39:36 -07:00
Jean Chalard
11aebd5a61 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 '05a2f21edfe84ed59488aa9981602f52639f9655':
2013-05-15 10:39:34 -07:00
Satoshi Kataoka
4c8d527fad 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 '148e15a93fa586a5a94ffcbaca43aefa27c2a38d':
2013-05-15 10:39:32 -07:00
Jean Chalard
d9508378df 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) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
* commit '06d8d5fc802c54d78603f16dc958d680d5dce949':
2013-05-15 10:39:30 -07:00
Jean Chalard
b751952633 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 NOT MERGE] Activate hardware keyboard handling
* commit 'a2ccaa57fc0474b5393394ff9e26762a3f089bab':
2013-05-15 10:39:28 -07:00
Kurt Partridge
033792b60d 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 'a24564b8f76c9aa3a384d2446d1e25ecfedec268':
2013-05-15 10:39:26 -07:00
Baligh Uddin
bcf54a1e28 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 translations. DO NOT MERGE"
* commit '7d5a1369c4b79ac62efee1168b9379da9116ae7e':
2013-05-15 10:39:24 -07:00
Baligh Uddin
87156ef48a 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. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '214d5b2cccffd713f12e49c698e67a9319eef44f':
2013-05-15 10:39:22 -07:00
Kurt Partridge
c9b193c1b4 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 'fdf1a05a57d70be081161bdacaced29866f2ce1b':
2013-05-15 10:39:20 -07:00
Jean Chalard
2d03ab456f 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 'c633b61ee00b0298f6f0cc1445317891d5760b89':
2013-05-15 10:39:13 -07:00
Tadashi G. Takaoka
254cb1ffcc 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 'd13a605cd91f15dc126d57401ebae967ac1ddeb5':
2013-05-15 10:39:09 -07:00
Satoshi Kataoka
e406c31654 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 '85cb23c4627987129f7a40db6b1b08fa9a4ade8b':
2013-05-15 10:39:07 -07:00
Jean Chalard
114e9c5621 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 '0eb45d7f370a8fe07dc7c407c5977e7501b1b0cc':
2013-05-15 10:39:05 -07:00
Jean Chalard
00f46f031b 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 '174ddfd47934cd6497c0bcf9dc65c3fb41744a06':
2013-05-15 10:39:03 -07:00
Satoshi Kataoka
94eeba653c 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 '78ed62326a8326dac53aa40df1f7b6353f4f9f63':
2013-05-15 10:39:01 -07:00
The Android Open Source Project
6e804061bc 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) Reconcile with jb-mr2-release - do not merge
* commit '7c4dff90a216190762e6e1a05b884b737533ad94':
2013-05-15 10:38:59 -07:00
Satoshi Kataoka
a7885e529d 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 '3d12edabf5059345b57e60c4de66e8de0dbddaaf':
2013-05-15 10:38:58 -07:00
Jean Chalard
840a0695d4 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 '55afe17c3c5510a0354f7e5e0480247a940bec7a':
2013-05-15 10:38:56 -07:00
Tadashi G. Takaoka
2bc1809de5 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 'e878a2770c7286eafe01ada3a90092514ac5ecdb':
2013-05-15 10:38:54 -07:00
Jean Chalard
60368456ec 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 '720ce530470d5b139389b0806d95e42cfa7cf5ac':
2013-05-15 10:38:52 -07:00
Jean Chalard
6e2e946d37 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 'a1187bd071d9a45e35efa97a8452b96f41457ea6':
2013-05-15 10:38:50 -07:00
Baligh Uddin
61076e10a7 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-latinimegoogle-azuki
* commit '04ef41417b9062d73a45670a7102619dcbe733d9':
2013-05-15 10:38:47 -07:00
Baligh Uddin
4fd9ca75d5 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 c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit '26e105b609ca0d06d364febd84e32730057f7bcc':
2013-05-15 10:38:45 -07:00
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