Kurt Partridge
|
021cf23f7d
|
am 5df602b0: am 1944521b: am 41a049a4: am ae144fe9: am d117c1a1: Merge "Do not record log split time when handling separator"
* commit '5df602b02ba034902f4377c39b2b5aaad9ee31f5':
|
2013-04-17 19:40:50 -07:00 |
The Android Open Source Project
|
5761746e15
|
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 '3d399706ca2fe0239d42adf827ff05b2e9c2ab27':
|
2013-04-17 19:40:49 -07:00 |
Ken Wakasa
|
e295aee847
|
am b1f51ca0: am d01118ae: am 4c896a2f: am f71b9640: am d17c8bd9: Update comments
* commit 'b1f51ca091ce11e669159e4c705ddea3c5782a08':
|
2013-04-17 19:40:47 -07:00 |
|
Ken Wakasa
|
14eb5e370f
|
am 42eafd44: am 3f55a951: am b3cf23de: am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit '42eafd44ef5b3f22edc03bc78ba8b03e35faeb4e':
|
2013-04-17 19:40:46 -07:00 |
|
Ken Wakasa
|
70a662716d
|
am b0a7c47d: am e4d60a2d: am ff730a66: am bc2fd24f: am b68e7344: Cleanup the include paths
* commit 'b0a7c47d28f9651b593eafd53ae11e4cd13b381a':
|
2013-04-17 19:40:44 -07:00 |
Satoshi Kataoka
|
285de8bbec
|
am a6e4ff7a: am c7d4f502: am c7e1caac: am cd0984a4: am e320789a: Suppress bigram native log
* commit 'a6e4ff7a3be816df90d6b82cd377a8c27618ce0e':
|
2013-04-17 19:40:43 -07:00 |
|
Satoshi Kataoka
|
eb8ecdc389
|
am f17c4e65: am 23b62c93: am 40d8b652: am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"
* commit 'f17c4e650885aa5d038666b77f51e397fa727920':
|
2013-04-17 19:40:42 -07:00 |
|
Ken Wakasa
|
e950a6174f
|
am b66b928a: am 1c9da7af: am 34cff46a: am ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings
* commit 'b66b928a96e5237d93e568f1b2ea7820dc03a2c4':
|
2013-04-17 19:40:40 -07:00 |
Jean Chalard
|
a52de59aec
|
am e4678cf9: am 81782419: am 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils"
* commit 'e4678cf9343ed02b8012bbb40d5c19a118a70030':
|
2013-04-17 19:40:39 -07:00 |
Tom Ouyang
|
b9ae8670a8
|
am 281b22bf: am 3c15067b: am 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class"
* commit '281b22bf0ad327fecf1f3ca47e2e550d35abdcc5':
|
2013-04-17 19:40:38 -07:00 |
Ben Cheng
|
3c547048f4
|
am 49273f43: am 76293949: am f82a5a24: am 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev
* commit '49273f43bb77244f4d7577ae23b7361336be05d0':
|
2013-04-17 19:40:36 -07:00 |
|
Satoshi Kataoka
|
d8c1aaf196
|
am c086c111: am b3d7d07e: am e90df243: am 481412bb: am f3633e9b: Merge "Add flag to turn on new suggest implementation for typing"
* commit 'c086c1115932958bdc415bda095c6c9eebb2c256':
|
2013-04-17 19:40:35 -07:00 |
Baligh Uddin
|
351ddb5a48
|
am 90044aab: am 1270880e: am da90ffe0: am 898ec2bf: am 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '90044aabfe01dc353a7711c98787c08af43e3af3':
|
2013-04-17 19:40:33 -07:00 |
|
Baligh Uddin
|
a276336eb5
|
am 2cd45944: am 83c5ec6b: (-s ours) am 005df808: am 12db86a6: am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NOT MERGE
* commit '2cd459448fff2ffa246c8f50b00b5e8ed29cc6f0':
|
2013-04-17 19:40:32 -07:00 |
The Android Automerger
|
a6ec455e50
|
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 'f67e74889e664f8ecca5a3fab6828d01987ea3d3':
|
2013-04-17 19:40:30 -07:00 |
|
Jean Chalard
|
e8675585cd
|
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 '2d6305cacbccfc5450147493f0276bba635aef12':
|
2013-04-17 19:40:29 -07:00 |
|
Jean Chalard
|
445d1115a0
|
am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit '7aa9277fd1d1919c5107f4c2856024a5a0da7c48':
|
2013-04-17 19:40:28 -07:00 |
|
Satoshi Kataoka
|
f9d5d10166
|
am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit '75b099f46d674f92328a39df3208728f9c391e09':
|
2013-04-17 19:40:26 -07:00 |
|
Jean Chalard
|
ce2a5f93ae
|
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 '44590a161fd15dcd8879c8f9eada15eee2234b50':
|
2013-04-17 19:40:25 -07:00 |
|
Jean Chalard
|
01a862fba3
|
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 'fd59acceff4deec5000dde5af431486e487d8a7c':
|
2013-04-17 19:40:24 -07:00 |
|
Kurt Partridge
|
0f8c86c8ea
|
am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit 'a3837fd1a0a01d34a7e6ef73e51c79d91e143c7a':
|
2013-04-17 19:40:22 -07:00 |
|
Kurt Partridge
|
24ba5149f0
|
am 436008fe: am d3497938: am ab8f166e: am 09ab6495: Merge "[FileEncap18] Clean up uploading scheduling"
* commit '436008fe8a3959c435b4f1067a0145ace1e3d678':
|
2013-04-17 19:40:20 -07:00 |
|
Baligh Uddin
|
08f0697bc3
|
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 '6a7f4639759864689a155fcc567a5b21b6993cb2':
|
2013-04-17 19:40:19 -07:00 |
|
Baligh Uddin
|
fbc9145961
|
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 '6ff63273e748484684ecae9c757615b68c8c6f49':
|
2013-04-17 19:40:18 -07:00 |
|
Kurt Partridge
|
3a63e4e3b8
|
am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '3fcaa3e8b4920dca0560e122a8a309087d02b26c':
|
2013-04-17 19:40:16 -07:00 |
|
Jean Chalard
|
56e931de80
|
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 'feb16b6d4f37156d7a42589c210a2c6759349935':
|
2013-04-17 19:40:15 -07:00 |
Tadashi G. Takaoka
|
85fca857af
|
am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '300d3bdee5ab6c3804e0c47ba0665a2d2140c56f':
|
2013-04-17 19:40:14 -07:00 |
|
Satoshi Kataoka
|
eeb386390a
|
am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit '656900003c92a370e3ac2e32b84631c1906d7d31':
|
2013-04-17 19:40:12 -07:00 |
|
Jean Chalard
|
e29ffdb6c6
|
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 'c14fdded82fb293bd6d5a7b5487e4c6b0c8625dd':
|
2013-04-17 19:40:11 -07:00 |
|
Jean Chalard
|
267e61790a
|
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 'c26022cf59801de74e19fda38a7aff76f3039ad4':
|
2013-04-17 19:40:10 -07:00 |
|
Satoshi Kataoka
|
371369d9f1
|
am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit 'd196cb6400c074c7c03416b62c2428986c3a74e2':
|
2013-04-17 19:40:09 -07:00 |
|
The Android Open Source Project
|
e2cc803c46
|
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 'a0b2dc74fa521cf584536b72e390f2aadb48d42b':
|
2013-04-17 19:40:07 -07:00 |
|
Satoshi Kataoka
|
1417566219
|
am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit 'b949db38568d02be216a9986ed0992ae57f0c13b':
|
2013-04-17 19:40:06 -07:00 |
|
Jean Chalard
|
34c0bef675
|
am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '9a181179b2c8ec8ee4b0468158cb565af8ceda8e':
|
2013-04-17 19:40:04 -07:00 |
|
Tadashi G. Takaoka
|
c01de7259d
|
am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '023ed8a661c792d6ab0e405469296971c27ddc4c':
|
2013-04-17 19:40:03 -07:00 |
|
Jean Chalard
|
a6ec1871fe
|
am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit '3f17ab4139e586536ea90a5d7d183ae78f273e00':
|
2013-04-17 19:40:02 -07:00 |
|
Jean Chalard
|
ccb3dc0225
|
am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '0eb58dfe0c30b9cbc34771bae2cda48fa94d2f79':
|
2013-04-17 19:40:00 -07:00 |
|
Baligh Uddin
|
2456eb3a25
|
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 'faa708c326b360eb6097587291727aff1a87fe56':
|
2013-04-17 19:39:59 -07:00 |
|
Baligh Uddin
|
f205c25863
|
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 'dbf9168f8616df012dc1faeaf3bffe34d7057d6a':
|
2013-04-17 19:39:57 -07:00 |
|
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 |