Kurt Partridge
|
0014e8db1b
|
am 6225fc10: am 8728b9d6: am 2f7ff3cf: am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"
* commit '6225fc106d4794aa33c64dd13bf6a45f006963c3':
|
2013-04-17 19:51:22 -07:00 |
|
Kurt Partridge
|
c922e67463
|
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 'd01cce402c2e5bd4ea82d1fb5bcc82d478fc1012':
|
2013-04-17 19:51:20 -07:00 |
The Android Open Source Project
|
a2319920be
|
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 'd31bb0b24a33ee9421663f47b144d8fbf6391b1b':
|
2013-04-17 19:51:19 -07:00 |
Ken Wakasa
|
0c61a0a096
|
am afdeefb5: am e295aee8: am b1f51ca0: am d01118ae: am 4c896a2f: am f71b9640: am d17c8bd9: Update comments
* commit 'afdeefb59386a4fde99b93cf4b5a0d91d2254aaf':
|
2013-04-17 19:51:17 -07:00 |
|
Ken Wakasa
|
cef20a89d8
|
am 3d85683a: am 14eb5e37: am 42eafd44: am 3f55a951: am b3cf23de: am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit '3d85683a9981778835d5e2ccd9e5e75af660218d':
|
2013-04-17 19:51:16 -07:00 |
|
Ken Wakasa
|
3c08c17fa8
|
am 9b83250e: am 70a66271: am b0a7c47d: am e4d60a2d: am ff730a66: am bc2fd24f: am b68e7344: Cleanup the include paths
* commit '9b83250e8ad484be5e16256f12b4218c59fd4764':
|
2013-04-17 19:51:14 -07:00 |
Satoshi Kataoka
|
8e3586df99
|
am 8ff8b9c5: am 285de8bb: am a6e4ff7a: am c7d4f502: am c7e1caac: am cd0984a4: am e320789a: Suppress bigram native log
* commit '8ff8b9c56c516d7194966496b9bc692c7b84fc87':
|
2013-04-17 19:51:13 -07:00 |
|
Satoshi Kataoka
|
9cc79ba5c8
|
am 79305b2e: am eb8ecdc3: am f17c4e65: am 23b62c93: am 40d8b652: am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"
* commit '79305b2eb772c1ea60db5f974099fca226f96c8d':
|
2013-04-17 19:51:12 -07:00 |
|
Ken Wakasa
|
3ba4425b73
|
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 'e4a8b944a21f4233ea8739418ffb3e647493dd5b':
|
2013-04-17 19:51:10 -07:00 |
Jean Chalard
|
26acfcfb57
|
am 13b555f1: am a52de59a: am e4678cf9: am 81782419: am 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils"
* commit '13b555f172e4961956768a44c15b521a5fd0c838':
|
2013-04-17 19:51:08 -07:00 |
Tom Ouyang
|
8aa5cab843
|
am 5dbfba7c: am b9ae8670: am 281b22bf: am 3c15067b: am 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class"
* commit '5dbfba7cf091f4876e9b491a5aa751954cc909b1':
|
2013-04-17 19:51:07 -07:00 |
Ben Cheng
|
864c241f3e
|
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 '6d9e0bb36f995c2c087d3686eb5f6245cae70c9c':
|
2013-04-17 19:51:06 -07:00 |
|
Satoshi Kataoka
|
79dbeb1c66
|
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 '67a537988e410074d951fa42eca724cb8fc88211':
|
2013-04-17 19:51:04 -07:00 |
Baligh Uddin
|
18fd43fcb9
|
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 '00f6c270a11a4a8227aa9d98239081152aa8178f':
|
2013-04-17 19:51:03 -07:00 |
|
Baligh Uddin
|
a4c7b28de1
|
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 'e0b4b47aa5ca5554ca5354db28010cb1a2f4b6de':
|
2013-04-17 19:51:02 -07:00 |
The Android Automerger
|
9cfe2a8aa8
|
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 'c3c7712f2052a4fbe04f0ba5b38f526913fc3c14':
|
2013-04-17 19:51:01 -07:00 |
|
Jean Chalard
|
a069e8d988
|
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 'd981caa79637412d3b90f9a29fed893ed5fd1b3e':
|
2013-04-17 19:50:59 -07:00 |
|
Jean Chalard
|
05a2f21edf
|
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 '46c38c6eab28dd3eefe9fed13dcaba2ce859a793':
|
2013-04-17 19:50:58 -07:00 |
|
Satoshi Kataoka
|
148e15a93f
|
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 'ab3280f0e44194e3fd460f87e2cd43bbfd77b406':
|
2013-04-17 19:50:56 -07:00 |
|
Jean Chalard
|
06d8d5fc80
|
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 '17e964b18c7d4848ba04b797c42a4aeee41b0a69':
|
2013-04-17 19:50:55 -07:00 |
|
Jean Chalard
|
a2ccaa57fc
|
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 'bd531725f55fb1d137c3fc984a68ce34125ec92c':
|
2013-04-17 19:50:53 -07:00 |
|
Kurt Partridge
|
a24564b8f7
|
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 '4376a55e043fa2e815cf6363525fd15eeed99b57':
|
2013-04-17 19:50:52 -07:00 |
|
Baligh Uddin
|
7d5a1369c4
|
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 '761c188aa41f7d42c440481e6082ae06d4f5b476':
|
2013-04-17 19:50:50 -07:00 |
|
Baligh Uddin
|
214d5b2ccc
|
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 '6f4025d64cc36dfe7d94ec406f740f08c4b9d3df':
|
2013-04-17 19:50:49 -07:00 |
|
Kurt Partridge
|
fdf1a05a57
|
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 'c0486a58efad1a78d399c8c1f36592e69e692a40':
|
2013-04-17 19:50:47 -07:00 |
|
Jean Chalard
|
c633b61ee0
|
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 'dbb031c74aa1104b9e6267afddf58271bee35a15':
|
2013-04-17 19:50:45 -07:00 |
Tadashi G. Takaoka
|
d13a605cd9
|
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 '59e17512cf9246cc2bce03e92ad90f584e712b5a':
|
2013-04-17 19:50:43 -07:00 |
|
Satoshi Kataoka
|
85cb23c462
|
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 'a08620f13f2aeec95861c4af9c9553ada6c32d47':
|
2013-04-17 19:50:41 -07:00 |
|
Jean Chalard
|
0eb45d7f37
|
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 '484e9144775a9cf81bd678974956aaaabad16d5d':
|
2013-04-17 19:50:40 -07:00 |
|
Jean Chalard
|
174ddfd479
|
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 '472f764f5740ebb785d25f19842b002f23c346c5':
|
2013-04-17 19:50:38 -07:00 |
|
Satoshi Kataoka
|
78ed62326a
|
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 'a59d936c44ccfc1882cd653acd80d168173e89aa':
|
2013-04-17 19:50:37 -07:00 |
|
The Android Open Source Project
|
7c4dff90a2
|
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 '892fcbfb8986b0ccef828dbc2f01d9ade4dfdf48':
|
2013-04-17 19:50:35 -07:00 |
|
Satoshi Kataoka
|
3d12edabf5
|
am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit 'e1829730c89fe10a6487857dd433cae861ac764e':
|
2013-04-17 19:50:34 -07:00 |
|
Jean Chalard
|
55afe17c3c
|
am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '783b0862a178ec3ffba4a3d3f86d6d92f9718a66':
|
2013-04-17 19:50:32 -07:00 |
|
Tadashi G. Takaoka
|
e878a2770c
|
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 'a1b056088fda2ae887143af879fe0b31be7193a5':
|
2013-04-17 19:50:31 -07:00 |
|
Jean Chalard
|
720ce53047
|
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 '9477d7b37eac71a57944a0e2e8f14293da9b5cdc':
|
2013-04-17 19:50:29 -07:00 |
|
Jean Chalard
|
a1187bd071
|
am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '8f89b9b13da770c0e4934ecd36b6fd4a2fe8d74d':
|
2013-04-17 19:50:27 -07:00 |
|
Baligh Uddin
|
04ef41417b
|
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 '42f36bb6ea2fc3ef46c4645328c42b2f0cb4fd77':
|
2013-04-17 19:50:25 -07:00 |
|
Baligh Uddin
|
26e105b609
|
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 '5e79a3446194be7f65ca9de78b2e4a372496a8e4':
|
2013-04-17 19:50:24 -07:00 |
|
The Android Automerger
|
8435a9b8ac
|
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 'abaea38f584001b75225d57e2da2136fde6a1933':
|
2013-04-17 19:50:22 -07:00 |
|
Tadashi G. Takaoka
|
52a89e5adf
|
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 'c7420082be85f138f5d1b17062f5ab5ef1203921':
|
2013-04-17 19:50:21 -07:00 |
|
Tadashi G. Takaoka
|
e5561f5241
|
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 '707d7d036c51be5ecb1e4ce4c30ace98a610153f':
|
2013-04-17 19:50:19 -07:00 |
|
Satoshi Kataoka
|
ef6e62dd75
|
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 '1ca787391e776f980312f93d7fee926fb7d2be15':
|
2013-04-17 19:50:18 -07:00 |
|
Tadashi G. Takaoka
|
398c686243
|
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 '8c8978196a03b43e3bb49b6aad96ce8d8ab265da':
|
2013-04-17 19:50:16 -07:00 |
|
Baligh Uddin
|
352e94b016
|
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: Import transl
* commit '13f392100cd9713762528d5008f525b605086856':
|
2013-04-17 19:50:15 -07:00 |
|
Baligh Uddin
|
33a9c2b26a
|
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 NOT MERGE
* commit 'c346b2dcfac3cac9defedf54f9f7a47fc0b5a0a6':
|
2013-04-17 19:50:13 -07:00 |
|
Baligh Uddin
|
8f89ca1d25
|
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 'b233e047f754e51530e5119ed5b3ed66372d8b7c':
|
2013-04-17 19:50:12 -07:00 |
|
Tadashi G. Takaoka
|
b53d753dcf
|
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 'd88350e271be4318253aa003250fadb658d0f6cc':
|
2013-04-17 19:50:10 -07:00 |
|
Baligh Uddin
|
aa52681bfc
|
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: Import transl
* commit '627db0092e0fdcab8b2d4bab9caa0477611e403e':
|
2013-04-17 19:50:09 -07:00 |
|
Baligh Uddin
|
719f8865fd
|
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. DO NOT MERGE"
* commit '2b19100ad6748aea1f4f9de768f2e45203738c44':
|
2013-04-17 19:50:07 -07:00 |