aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8e3586df: am 8ff8b9c5: am 285de8bb: am a6e4ff7a: am c7d4f502: am ↵Satoshi Kataoka2013-05-150-0/+0
|\ | | | | | | | | | | c7e1caac: am cd0984a4: am e320789a: Suppress bigram native log * commit '8e3586df99482d415e52ab2a4850053cc2748337':
| * am 8ff8b9c5: am 285de8bb: am a6e4ff7a: am c7d4f502: am c7e1caac: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\ | | | | | | | | | | | | | | | cd0984a4: am e320789a: Suppress bigram native log * commit '8ff8b9c56c516d7194966496b9bc692c7b84fc87':
| | * am 285de8bb: am a6e4ff7a: am c7d4f502: am c7e1caac: am cd0984a4: am ↵Satoshi Kataoka2013-04-170-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | e320789a: Suppress bigram native log * commit '285de8bbecafaf16b0d357eba7a1d4e86c1f62b6':
* | | | am 9cc79ba5: am 79305b2e: am eb8ecdc3: am f17c4e65: am 23b62c93: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 40d8b652: am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface" * commit '9cc79ba5c89bcc4d0c9789fd14986cee9a795a48':
| * | | am 79305b2e: am eb8ecdc3: am f17c4e65: am 23b62c93: am 40d8b652: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | dfb680c4: am f5e18e99: Merge "Cleanup suggest interface" * commit '79305b2eb772c1ea60db5f974099fca226f96c8d':
| | * | am eb8ecdc3: am f17c4e65: am 23b62c93: am 40d8b652: am dfb680c4: am ↵Satoshi Kataoka2013-04-170-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | f5e18e99: Merge "Cleanup suggest interface" * commit 'eb8ecdc3899579d8eb395566a3406b74c8b2163d':
* | | | | am 3ba4425b: am e4a8b944: am e950a617: am b66b928a: am 1c9da7af: am ↵Ken Wakasa2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34cff46a: am ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings * commit '3ba4425b73faa19a00aef96fbede9f3bbd58d9ae':
| * | | | am e4a8b944: am e950a617: am b66b928a: am 1c9da7af: am 34cff46a: am ↵Ken Wakasa2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings * commit 'e4a8b944a21f4233ea8739418ffb3e647493dd5b':
| | * | | am e950a617: am b66b928a: am 1c9da7af: am 34cff46a: am ed8fd94e: am ↵Ken Wakasa2013-04-170-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 370461ef: Clean up a few option strings under the Advanced settings * commit 'e950a6174fff709d52e5e733f35a722915735735':
* | | | | | am 26acfcfb: am 13b555f1: am a52de59a: am e4678cf9: am 81782419: am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils" * commit '26acfcfb57dca1a3aaff9128ffb8f81f35572e8a':
| * | | | | am 13b555f1: am a52de59a: am e4678cf9: am 81782419: am 024d0e4a: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils" * commit '13b555f172e4961956768a44c15b521a5fd0c838':
| | * | | | am a52de59a: am e4678cf9: am 81782419: am 024d0e4a: am f10e7cbe: am ↵Jean Chalard2013-04-170-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9f69e16: Merge "Move a generic string utility to StringUtils" * commit 'a52de59aecc3ac011deb08f288c1bd508adfc9e1':
* | | | | | | am 8aa5cab8: am 5dbfba7c: am b9ae8670: am 281b22bf: am 3c15067b: am ↵Tom Ouyang2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class" * commit '8aa5cab84377ae8fffdd5ddfb37b83eca3e73c5a':
| * | | | | | am 5dbfba7c: am b9ae8670: am 281b22bf: am 3c15067b: am 8ab65b8b: am ↵Tom Ouyang2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class" * commit '5dbfba7cf091f4876e9b491a5aa751954cc909b1':
| | * | | | | am b9ae8670: am 281b22bf: am 3c15067b: am 8ab65b8b: am 4096fd08: am ↵Tom Ouyang2013-04-170-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08fd3d95: Merge "Add DigraphUtils class" * commit 'b9ae8670a8bacafac414607bcd79353758f2046a':
* | | | | | | | am 864c241f: am 6d9e0bb3: am 3c547048: am 49273f43: am 76293949: am ↵Ben Cheng2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f82a5a24: am 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev * commit '864c241f3edb27214373dbdb988754251259d9d3':
| * | | | | | | am 6d9e0bb3: am 3c547048: am 49273f43: am 76293949: am f82a5a24: am ↵Ben Cheng2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev * commit '6d9e0bb36f995c2c087d3686eb5f6245cae70c9c':
| | * | | | | | am 3c547048: am 49273f43: am 76293949: am f82a5a24: am 96cb244d: am ↵Ben Cheng2013-04-170-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev * commit '3c547048f4f1782c06fb8cf80f18974043bcf37b':
* | | | | | | | | am 79dbeb1c: am 67a53798: am d8c1aaf1: am c086c111: am b3d7d07e: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e90df243: am 481412bb: am f3633e9b: Merge "Add flag to turn on new suggest implementation for typing" * commit '79dbeb1c66c2e65a320228dbd4fa50731e16642f':
| * | | | | | | | am 67a53798: am d8c1aaf1: am c086c111: am b3d7d07e: am e90df243: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 481412bb: am f3633e9b: Merge "Add flag to turn on new suggest implementation for typing" * commit '67a537988e410074d951fa42eca724cb8fc88211':
| | * | | | | | | am d8c1aaf1: am c086c111: am b3d7d07e: am e90df243: am 481412bb: am ↵Satoshi Kataoka2013-04-170-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3633e9b: Merge "Add flag to turn on new suggest implementation for typing" * commit 'd8c1aaf196ec429f9e0c790e158340bfe4d5834d':
* | | | | | | | | | am 18fd43fc: am 00f6c270: am 351ddb5a: am 90044aab: am 1270880e: am ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da90ffe0: am 898ec2bf: am 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki * commit '18fd43fcb982c4bef96708d39ec59dc2b62c71e4':
| * | | | | | | | | am 00f6c270: am 351ddb5a: am 90044aab: am 1270880e: am da90ffe0: am ↵Baligh Uddin2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 898ec2bf: am 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki * commit '00f6c270a11a4a8227aa9d98239081152aa8178f':
| | * | | | | | | | am 351ddb5a: am 90044aab: am 1270880e: am da90ffe0: am 898ec2bf: am ↵Baligh Uddin2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogle-azuki * commit '351ddb5a48d16cb1eb6e632b590b73ab71ceaa17':
* | | | | | | | | | | am a4c7b28d: am e0b4b47a: (-s ours) am a276336e: am 2cd45944: am 83c5ec6b: ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 005df808: am 12db86a6: am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NOT MERGE * commit 'a4c7b28de1275d1dbcc0c219e6acdbff36747605':
| * | | | | | | | | | am e0b4b47a: (-s ours) am a276336e: am 2cd45944: am 83c5ec6b: (-s ours) am ↵Baligh Uddin2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 005df808: am 12db86a6: am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NOT MERGE * commit 'e0b4b47aa5ca5554ca5354db28010cb1a2f4b6de':
| | * | | | | | | | | am a276336e: am 2cd45944: am 83c5ec6b: (-s ours) am 005df808: am 12db86a6: ↵Baligh Uddin2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NOT MERGE * commit 'a276336eb5d67a4667e0b90edbff22598774ab23':
* | | | | | | | | | | | am 9cfe2a8a: am c3c7712f: am a6ec455e: am f67e7488: am ed19c005: am ↵The Android Automerger2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ddb50fff: am d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle * commit '9cfe2a8aa8b77a64930522c750a21e6e7ca70e38':
| * | | | | | | | | | | am c3c7712f: am a6ec455e: am f67e7488: am ed19c005: am ddb50fff: am ↵The Android Automerger2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle * commit 'c3c7712f2052a4fbe04f0ba5b38f526913fc3c14':
| | * | | | | | | | | | am a6ec455e: am f67e7488: am ed19c005: am ddb50fff: am d4b63931: am ↵The Android Automerger2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle * commit 'a6ec455e5002c1d6868f2f0a2ee3a3858794e6c2':
* | | | | | | | | | | | | am a069e8d9: am d981caa7: am e8675585: am 2d6305ca: am 4d21e347: am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edf26bee: am d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through" * commit 'a069e8d98861559428120e479dcbb1d95e89169f':
| * | | | | | | | | | | | am d981caa7: am e8675585: am 2d6305ca: am 4d21e347: am edf26bee: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through" * commit 'd981caa79637412d3b90f9a29fed893ed5fd1b3e':
| | * | | | | | | | | | | am e8675585: am 2d6305ca: am 4d21e347: am edf26bee: am d1491741: am ↵Jean Chalard2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through" * commit 'e8675585cdacdce8ffdf169fa876cfa5a82e77a2':
* | | | | | | | | | | | | | am 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '05a2f21edfe84ed59488aa9981602f52639f9655':
| * | | | | | | | | | | | | am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '46c38c6eab28dd3eefe9fed13dcaba2ce859a793':
| | * | | | | | | | | | | | am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am ↵Jean Chalard2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test." * commit '445d1115a00134846e51a38124d8679ad5c4e91b':
* | | | | | | | | | | | | | | am 148e15a9: am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit '148e15a93fa586a5a94ffcbaca43aefa27c2a38d':
| * | | | | | | | | | | | | | am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am ↵Satoshi Kataoka2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit 'ab3280f0e44194e3fd460f87e2cd43bbfd77b406':
| | * | | | | | | | | | | | | am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am ↵Satoshi Kataoka2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP" * commit 'f9d5d10166d4e152e273196666e789f989112fdc':
* | | | | | | | | | | | | | | | am 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-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':
| * | | | | | | | | | | | | | | am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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':
| | * | | | | | | | | | | | | | am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: ↵Jean Chalard2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling" * commit 'ce2a5f93aed2862f4397871d317d31baeac57f82':
* | | | | | | | | | | | | | | | | am a2ccaa57: am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-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':
| * | | | | | | | | | | | | | | | am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am ↵Jean Chalard2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling * commit 'bd531725f55fb1d137c3fc984a68ce34125ec92c':
| | * | | | | | | | | | | | | | | am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: ↵Jean Chalard2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling * commit '01a862fba392db93985d7c644ba4728047b7ec2d':
* | | | | | | | | | | | | | | | | | am a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am ↵Kurt Partridge2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit 'a24564b8f76c9aa3a384d2446d1e25ecfedec268':
| * | | | | | | | | | | | | | | | | am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am ↵Kurt Partridge2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit '4376a55e043fa2e815cf6363525fd15eeed99b57':
| | * | | | | | | | | | | | | | | | am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am ↵Kurt Partridge2013-04-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently." * commit '0f8c86c8ea9a81f0f4dd2fcf0c9abc9e1568125f':
* | | | | | | | | | | | | | | | | | | am 7d5a1369: am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-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':
| * | | | | | | | | | | | | | | | | | am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am ↵Baligh Uddin2013-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '761c188aa41f7d42c440481e6082ae06d4f5b476':