aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0c2f096b: am c26225eb: am e7a43a38: am 94bc0eca: am 0b8bf274: am ↵Satoshi Kataoka2013-10-030-0/+0
|\ | | | | | | | | | | a3742e66: am 44d2f4a2: am a4c26b8a: am da4f353d: am 74f7fb1d: am d0594519: am 4945b656: am 6c7d008e: Merge "add a debug flag to evaluate the most probable string" * commit '0c2f096bf5a5a9ef8414b40aceae99e853f63b99':
| * am c26225eb: am e7a43a38: am 94bc0eca: am 0b8bf274: am a3742e66: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\ | | | | | | | | | | | | | | | 44d2f4a2: am a4c26b8a: am da4f353d: am 74f7fb1d: am d0594519: am 4945b656: am 6c7d008e: Merge "add a debug flag to evaluate the most probable string" * commit 'c26225eb1f7a0ec2959db8faa62ee415c43551e6':
| | * am e7a43a38: am 94bc0eca: am 0b8bf274: am a3742e66: am 44d2f4a2: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | a4c26b8a: am da4f353d: am 74f7fb1d: am d0594519: am 4945b656: am 6c7d008e: Merge "add a debug flag to evaluate the most probable string" * commit 'e7a43a3804cdeb3dc780d441b74c11489a84ebde':
| | | * am 94bc0eca: am 0b8bf274: am a3742e66: am 44d2f4a2: am a4c26b8a: am ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | da4f353d: am 74f7fb1d: am d0594519: am 4945b656: am 6c7d008e: Merge "add a debug flag to evaluate the most probable string" * commit '94bc0ecaeffb03c34b560e13730ad036ceee81a5':
* | | | | am e904c26b: am f693dd68: am f5010253: am 9d4e9773: am e98ba42b: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8dd50ad: am 229c7a19: am 663809c9: am 83af8482: am 9b888ca4: am 24b39f16: am 18819688: am 6d0027a4: Merge "Use SparseIntArray instead of TreeMap<Integer, Integer>" * commit 'e904c26b30afbf1c7e44c906e598505c3c19f992':
| * | | | am f693dd68: am f5010253: am 9d4e9773: am e98ba42b: am e8dd50ad: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 229c7a19: am 663809c9: am 83af8482: am 9b888ca4: am 24b39f16: am 18819688: am 6d0027a4: Merge "Use SparseIntArray instead of TreeMap<Integer, Integer>" * commit 'f693dd6810e93bb5a9f1c8ac087731401d5453a7':
| | * | | am f5010253: am 9d4e9773: am e98ba42b: am e8dd50ad: am 229c7a19: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | 663809c9: am 83af8482: am 9b888ca4: am 24b39f16: am 18819688: am 6d0027a4: Merge "Use SparseIntArray instead of TreeMap<Integer, Integer>" * commit 'f501025314be7c27d25644a0f61e14ca51c77c22':
| | | * | am 9d4e9773: am e98ba42b: am e8dd50ad: am 229c7a19: am 663809c9: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83af8482: am 9b888ca4: am 24b39f16: am 18819688: am 6d0027a4: Merge "Use SparseIntArray instead of TreeMap<Integer, Integer>" * commit '9d4e97739cf842fc88d343fbe54d60bb461ba772':
* | | | | | am 3aec5a7a: am a66b076d: am d218cfc6: am a16c27be: am 45892476: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ca372e6: am e2834d8f: am 8aefc778: am 5c6fcf61: am 1c3bc4af: am dabcd969: am 1dc7fd3f: am cee512b6: Merge "More precise geometry checking for more keys keyboard" * commit '3aec5a7a48cc69d91dcb9ec06dd3cecb2fab6f74':
| * | | | | am a66b076d: am d218cfc6: am a16c27be: am 45892476: am 9ca372e6: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2834d8f: am 8aefc778: am 5c6fcf61: am 1c3bc4af: am dabcd969: am 1dc7fd3f: am cee512b6: Merge "More precise geometry checking for more keys keyboard" * commit 'a66b076da34427cb8c6e9b5fbd44f7f551847f40':
| | * | | | am d218cfc6: am a16c27be: am 45892476: am 9ca372e6: am e2834d8f: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8aefc778: am 5c6fcf61: am 1c3bc4af: am dabcd969: am 1dc7fd3f: am cee512b6: Merge "More precise geometry checking for more keys keyboard" * commit 'd218cfc6a61ec92b70fc117df2f99eab1eb42d0c':
| | | * | | am a16c27be: am 45892476: am 9ca372e6: am e2834d8f: am 8aefc778: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c6fcf61: am 1c3bc4af: am dabcd969: am 1dc7fd3f: am cee512b6: Merge "More precise geometry checking for more keys keyboard" * commit 'a16c27beff5cb607fec149cb247cd2073ed1a7a4':
* | | | | | | am 2cf7c6f7: am f729cd38: am 390b0c8d: am 7770839d: am d1f279e0: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 253e5eeb: am bc6f49ba: am 09ddc933: am 852e031c: am 6743a354: am e910a9c9: am b7917ee3: am 3722f087: Merge "Fix two bugs in dicttool" * commit '2cf7c6f7fd86c7ccd985426668d1a3eb7b036137':
| * | | | | | am f729cd38: am 390b0c8d: am 7770839d: am d1f279e0: am 253e5eeb: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc6f49ba: am 09ddc933: am 852e031c: am 6743a354: am e910a9c9: am b7917ee3: am 3722f087: Merge "Fix two bugs in dicttool" * commit 'f729cd38aa7f0d9b7af53e59032eae09b0da89ac':
| | * | | | | am 390b0c8d: am 7770839d: am d1f279e0: am 253e5eeb: am bc6f49ba: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09ddc933: am 852e031c: am 6743a354: am e910a9c9: am b7917ee3: am 3722f087: Merge "Fix two bugs in dicttool" * commit '390b0c8dda5970da40fed67ac73e45b32da290a7':
| | | * | | | am 7770839d: am d1f279e0: am 253e5eeb: am bc6f49ba: am 09ddc933: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 852e031c: am 6743a354: am e910a9c9: am b7917ee3: am 3722f087: Merge "Fix two bugs in dicttool" * commit '7770839d3bf87aafa7cead8955a2817b47708d38':
* | | | | | | | am cc53e47c: am cdfbcf45: am f9641f21: am e765b721: (-s ours) am 36e9a049: ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 1e1b2e1d: (-s ours) am a29f9ab9: (-s ours) am 3a2b13a4: (-s ours) am 46ef1ae8: am a4cd9ff5: (-s ours) am 42674ece: am 0afbd6fd: am 269f141b: (-s ours) am cfdc91b9: am 58df3cfa: Imp * commit 'cc53e47cb6600aa80a41bbbaed4f819782a87545':
| * | | | | | | am cdfbcf45: am f9641f21: am e765b721: (-s ours) am 36e9a049: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e1b2e1d: (-s ours) am a29f9ab9: (-s ours) am 3a2b13a4: (-s ours) am 46ef1ae8: am a4cd9ff5: (-s ours) am 42674ece: am 0afbd6fd: am 269f141b: (-s ours) am cfdc91b9: am 58df3cfa: Import translati * commit 'cdfbcf454df75755d5ff8bd0ed759321c09ceb28':
| | * | | | | | am f9641f21: am e765b721: (-s ours) am 36e9a049: (-s ours) am 1e1b2e1d: (-s ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) am a29f9ab9: (-s ours) am 3a2b13a4: (-s ours) am 46ef1ae8: am a4cd9ff5: (-s ours) am 42674ece: am 0afbd6fd: am 269f141b: (-s ours) am cfdc91b9: am 58df3cfa: Import translations. DO NOT M * commit 'f9641f21ff4abee113e16c891dc0a4ad1f736547':
| | | * | | | | am e765b721: (-s ours) am 36e9a049: (-s ours) am 1e1b2e1d: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a29f9ab9: (-s ours) am 3a2b13a4: (-s ours) am 46ef1ae8: am a4cd9ff5: (-s ours) am 42674ece: am 0afbd6fd: am 269f141b: (-s ours) am cfdc91b9: am 58df3cfa: Import translations. DO NOT MERGE * commit 'e765b721bdffbdfeb12d11d74ebc01375384c2e7':
* | | | | | | | | am 582b25e1: am 058dc32a: am d396be7d: am d43365d0: am ca2bcde0: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17424cb0: am ece78ab3: am eefc719f: am 5582d07e: am 47b7fe24: am 330d0330: am e3dcbd80: am ac018da6: am 9620943c: am d9a22235: Hide Setup Wizard icon for stock keyboard * commit '582b25e1cf4b63146bc721756e321f7bcbb8a3de':
| * | | | | | | | am 058dc32a: am d396be7d: am d43365d0: am ca2bcde0: am 17424cb0: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ece78ab3: am eefc719f: am 5582d07e: am 47b7fe24: am 330d0330: am e3dcbd80: am ac018da6: am 9620943c: am d9a22235: Hide Setup Wizard icon for stock keyboard * commit '058dc32a010b47514085137fc4cf2bdc19049a92':
| | * | | | | | | am d396be7d: am d43365d0: am ca2bcde0: am 17424cb0: am ece78ab3: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eefc719f: am 5582d07e: am 47b7fe24: am 330d0330: am e3dcbd80: am ac018da6: am 9620943c: am d9a22235: Hide Setup Wizard icon for stock keyboard * commit 'd396be7d107a2279df5a4a10ca3a6c34dda5b0fc':
| | | * | | | | | am d43365d0: am ca2bcde0: am 17424cb0: am ece78ab3: am eefc719f: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5582d07e: am 47b7fe24: am 330d0330: am e3dcbd80: am ac018da6: am 9620943c: am d9a22235: Hide Setup Wizard icon for stock keyboard * commit 'd43365d066e98a9f8f58fc091b15613023decb72':
* | | | | | | | | | am b38f80f3: am e5b245dc: am 1a9c7aa7: am 259dd5f2: am 0b772ff6: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4aa5c2a: am e22bdaae: am 1555f75b: am f5214d22: am 0e957017: am cdf19f12: am 9bca1daf: am defd2950: am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary." * commit 'b38f80f390895e2dd7d89995d3eaf5f68c7757ae':
| * | | | | | | | | am e5b245dc: am 1a9c7aa7: am 259dd5f2: am 0b772ff6: am b4aa5c2a: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e22bdaae: am 1555f75b: am f5214d22: am 0e957017: am cdf19f12: am 9bca1daf: am defd2950: am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary." * commit 'e5b245dc50c13815fbe8fc398ce147f5bc36f79f':
| | * | | | | | | | am 1a9c7aa7: am 259dd5f2: am 0b772ff6: am b4aa5c2a: am e22bdaae: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1555f75b: am f5214d22: am 0e957017: am cdf19f12: am 9bca1daf: am defd2950: am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary." * commit '1a9c7aa7cac1a32a401ec7cf157f04458402f54c':
| | | * | | | | | | am 259dd5f2: am 0b772ff6: am b4aa5c2a: am e22bdaae: am 1555f75b: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5214d22: am 0e957017: am cdf19f12: am 9bca1daf: am defd2950: am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary." * commit '259dd5f2e213acc9ae7481d2e5af629aa5e2629c':
* | | | | | | | | | | am 1319880a: am 3dd261fb: am 91ce4fd6: am af11cd57: am af1fa668: am ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5fca3d1: am 08474770: am a03026b2: am 8ef42ea5: am 37e9a69f: am 472591fe: am ea8c4731: am d355283f: am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration" * commit '1319880a89a52e824041ced1ea39973965dbd7c5':
| * | | | | | | | | | am 3dd261fb: am 91ce4fd6: am af11cd57: am af1fa668: am e5fca3d1: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08474770: am a03026b2: am 8ef42ea5: am 37e9a69f: am 472591fe: am ea8c4731: am d355283f: am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration" * commit '3dd261fb7b6517758e0480abc40bb71c542c3a46':
| | * | | | | | | | | am 91ce4fd6: am af11cd57: am af1fa668: am e5fca3d1: am 08474770: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a03026b2: am 8ef42ea5: am 37e9a69f: am 472591fe: am ea8c4731: am d355283f: am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration" * commit '91ce4fd6fb4878bba17607e3007306ca6fc2dba3':
| | | * | | | | | | | am af11cd57: am af1fa668: am e5fca3d1: am 08474770: am a03026b2: am ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ef42ea5: am 37e9a69f: am 472591fe: am ea8c4731: am d355283f: am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration" * commit 'af11cd5748ece83699e48b57c35950aa57cf0565':
* | | | | | | | | | | | am 6467a6c1: am 601106af: am df381f3b: am b7687c79: am a2c6d2e0: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6f0345e: am a1b9258e: am b907a631: am 6c76c651: am cae4c914: am 0dc8c6e9: am 41ac21dd: am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests" * commit '6467a6c159b5f4e40250c88fcedbd6729785d22c':
| * | | | | | | | | | | am 601106af: am df381f3b: am b7687c79: am a2c6d2e0: am b6f0345e: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1b9258e: am b907a631: am 6c76c651: am cae4c914: am 0dc8c6e9: am 41ac21dd: am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests" * commit '601106af1f5db5efda9b2f3c5a39a2d25b94a64c':
| | * | | | | | | | | | am df381f3b: am b7687c79: am a2c6d2e0: am b6f0345e: am a1b9258e: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b907a631: am 6c76c651: am cae4c914: am 0dc8c6e9: am 41ac21dd: am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests" * commit 'df381f3b04a07ef4e92205092785fb9784658449':
| | | * | | | | | | | | am b7687c79: am a2c6d2e0: am b6f0345e: am a1b9258e: am b907a631: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c76c651: am cae4c914: am 0dc8c6e9: am 41ac21dd: am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests" * commit 'b7687c79f83521a166bc46f822ea5a3e69e8b17c':
* | | | | | | | | | | | | am 0d26fba5: am 2736c06e: am be1e5db5: am 19b75973: am 2fa15f80: am ↵Kurt Partridge2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa0d5038: am 29867576: am 219aca5b: am 0014e8db: am 6225fc10: am 8728b9d6: am 2f7ff3cf: am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying" * commit '0d26fba55c15c2fabb64e0aa97bd814e1bc98ee1':
| * | | | | | | | | | | | am 2736c06e: am be1e5db5: am 19b75973: am 2fa15f80: am fa0d5038: am ↵Kurt Partridge2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29867576: am 219aca5b: am 0014e8db: am 6225fc10: am 8728b9d6: am 2f7ff3cf: am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying" * commit '2736c06e135b2b5ec667fe9415327eab1ad37b7e':
| | * | | | | | | | | | | am be1e5db5: am 19b75973: am 2fa15f80: am fa0d5038: am 29867576: am ↵Kurt Partridge2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 219aca5b: am 0014e8db: am 6225fc10: am 8728b9d6: am 2f7ff3cf: am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying" * commit 'be1e5db580caa42ccd30a761b57d24ebc4b39886':
| | | * | | | | | | | | | am 19b75973: am 2fa15f80: am fa0d5038: am 29867576: am 219aca5b: am ↵Kurt Partridge2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0014e8db: am 6225fc10: am 8728b9d6: am 2f7ff3cf: am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying" * commit '19b75973a5990e2380e07a79760039559847e19f':
* | | | | | | | | | | | | | am b87e83da: am faa84ff6: am 07155e26: am d2a6c5b6: am 8bb5f51e: am ↵Kurt Partridge2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84d3c573: am 376766a8: am d7ab90eb: 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 'b87e83da29e863fc1f5e57f8b1082ee6462ca5c4':
| * | | | | | | | | | | | | am faa84ff6: am 07155e26: am d2a6c5b6: am 8bb5f51e: am 84d3c573: am ↵Kurt Partridge2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 376766a8: am d7ab90eb: 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 'faa84ff62c7b2665823b67d533ee26d22a11cce9':
| | * | | | | | | | | | | | am 07155e26: am d2a6c5b6: am 8bb5f51e: am 84d3c573: am 376766a8: am ↵Kurt Partridge2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7ab90eb: 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 '07155e261279c3d8c11c6430dff310c27545e53d':
| | | * | | | | | | | | | | am d2a6c5b6: am 8bb5f51e: am 84d3c573: am 376766a8: am d7ab90eb: am ↵Kurt Partridge2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'd2a6c5b6ba79453ddab4730be3793d0ab0f56719':
* | | | | | | | | | | | | | | am 48794624: am f954815e: am e68a743e: am b87f91ea: am 0f8d55bc: am ↵The Android Open Source Project2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6b083a8: (-s ours) am c7b33b10: (-s ours) am 24051f14: (-s ours) am a2319920: am d31bb0b2: (-s ours) am 5761746e: am 3d399706: am c89354b9: (-s ours) am fb899d85: am 3019a5e1: am a8d29082: (-s ours) * commit '487946246ba9971d6bbe6ee46c968f097730968c':
| * | | | | | | | | | | | | | am f954815e: am e68a743e: am b87f91ea: am 0f8d55bc: am d6b083a8: (-s ours) ↵The Android Open Source Project2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c7b33b10: (-s ours) am 24051f14: (-s ours) am a2319920: am d31bb0b2: (-s ours) am 5761746e: am 3d399706: am c89354b9: (-s ours) am fb899d85: am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: * commit 'f954815eb49ca9ba884d880a8eab3ea50e04c988':
| | * | | | | | | | | | | | | am e68a743e: am b87f91ea: am 0f8d55bc: am d6b083a8: (-s ours) am c7b33b10: ↵The Android Open Source Project2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 24051f14: (-s ours) 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 wit * commit 'e68a743e3218d8a622bed77342af1d30ccb46055':
| | | * | | | | | | | | | | | am b87f91ea: am 0f8d55bc: am d6b083a8: (-s ours) am c7b33b10: (-s ours) am ↵The Android Open Source Project2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24051f14: (-s ours) 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-rele * commit 'b87f91ea395d8c10cbac47edb104ee16faed7135':
* | | | | | | | | | | | | | | | am 4e1a3e01: am e37b2f9c: am 33bccd46: am c18d6bc4: am a14a3927: am ↵Ken Wakasa2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e678f6fb: am a41c9bfb: am 00c01f78: am 0c61a0a0: am afdeefb5: am e295aee8: am b1f51ca0: am d01118ae: am 4c896a2f: am f71b9640: am d17c8bd9: Update comments * commit '4e1a3e015287d0a7d1c7b57c1afd83eabf3c5727':
| * | | | | | | | | | | | | | | am e37b2f9c: am 33bccd46: am c18d6bc4: am a14a3927: am e678f6fb: am ↵Ken Wakasa2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a41c9bfb: am 00c01f78: am 0c61a0a0: am afdeefb5: am e295aee8: am b1f51ca0: am d01118ae: am 4c896a2f: am f71b9640: am d17c8bd9: Update comments * commit 'e37b2f9c12af77cac37d817d9ab4e3763c23cdd5':