aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am cfbfed87: am 96ae92b9: am e69d5c66: am 247d44b5: am 3b48d3fb: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\ | | | | | | | | | | 853cd794: am 42c716be: am 36f45921: Merge "Refactoring header attribute reading." * commit 'cfbfed8739726366fa44a3826ff1d6ea658fa506':
| * am 96ae92b9: am e69d5c66: am 247d44b5: am 3b48d3fb: am 853cd794: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
| |\ | | | | | | | | | | | | | | | 42c716be: am 36f45921: Merge "Refactoring header attribute reading." * commit '96ae92b9567c6c015f2e281387800100dd5f73fb':
| | * am e69d5c66: am 247d44b5: am 3b48d3fb: am 853cd794: am 42c716be: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | 36f45921: Merge "Refactoring header attribute reading." * commit 'e69d5c66a4046ef03fb6602fbf3a7ed03f943c8a':
| | | * am 247d44b5: am 3b48d3fb: am 853cd794: am 42c716be: am 36f45921: Merge ↵Keisuke Kuroyanagi2013-10-030-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | "Refactoring header attribute reading." * commit '247d44b57bb1ed604e08cc395a328adc85d7a1d3':
* | | | | am a4a293ff: (-s ours) am e3477817: (-s ours) am 6a716858: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | efba36bf: (-s ours) am 8a0013f3: (-s ours) am 7225cbf8: (-s ours) am 1a8d1cbc: (-s ours) am d28ea2b5: (-s ours) am 1e4ab88d: (-s ours) am 5a1d1557: (-s ours) Import translations. DO NOT MERGE * commit 'a4a293ffe26532e6920cc4dc3a39cc66965658bf':
| * | | | am e3477817: (-s ours) am 6a716858: (-s ours) am efba36bf: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a0013f3: (-s ours) am 7225cbf8: (-s ours) am 1a8d1cbc: (-s ours) am d28ea2b5: (-s ours) am 1e4ab88d: (-s ours) am 5a1d1557: (-s ours) Import translations. DO NOT MERGE * commit 'e347781713c70486f23fdccf101441557f58db88':
| | * | | am 6a716858: (-s ours) am efba36bf: (-s ours) am 8a0013f3: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | 7225cbf8: (-s ours) am 1a8d1cbc: (-s ours) am d28ea2b5: (-s ours) am 1e4ab88d: (-s ours) am 5a1d1557: (-s ours) Import translations. DO NOT MERGE * commit '6a7168580d3fa285e2e51194364d332bfd555f0f':
| | | * | am efba36bf: (-s ours) am 8a0013f3: (-s ours) am 7225cbf8: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a8d1cbc: (-s ours) am d28ea2b5: (-s ours) am 1e4ab88d: (-s ours) am 5a1d1557: (-s ours) Import translations. DO NOT MERGE * commit 'efba36bf2b0b3d16b02f3bf3622a5a7ef70888a2':
* | | | | | am c73ff59e: am c532622b: am 8592c44f: am f5ddd568: am 252fe86f: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99a15f84: am 2f11bc9b: am 009dcac3: Boundary check for children creating of PatriciaTriePolicy. * commit 'c73ff59e2944b6759af082c551404d4368925873':
| * | | | | am c532622b: am 8592c44f: am f5ddd568: am 252fe86f: am 99a15f84: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f11bc9b: am 009dcac3: Boundary check for children creating of PatriciaTriePolicy. * commit 'c532622b18cd3ed29eca7b915d527d0dc3cdf5dc':
| | * | | | am 8592c44f: am f5ddd568: am 252fe86f: am 99a15f84: am 2f11bc9b: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 009dcac3: Boundary check for children creating of PatriciaTriePolicy. * commit '8592c44fc1a2fd47c16ca2f6c2f9abdc265798ce':
| | | * | | am f5ddd568: am 252fe86f: am 99a15f84: am 2f11bc9b: am 009dcac3: Boundary ↵Keisuke Kuroyanagi2013-10-030-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check for children creating of PatriciaTriePolicy. * commit 'f5ddd5682218dc7f9030c47308fa257fb31413c8':
* | | | | | | am e6def5f5: am 886f8d3a: am fd86a818: am 2ac06cc8: am 9ca0e511: am ↵Ken Wakasa2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 086ffdcc: am 6c0e48b1: am 4350a93a: Merge "Fix the offdevice regression test build" * commit 'e6def5f58d8130556271e1b651520dcacb6acf75':
| * | | | | | am 886f8d3a: am fd86a818: am 2ac06cc8: am 9ca0e511: am 086ffdcc: am ↵Ken Wakasa2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c0e48b1: am 4350a93a: Merge "Fix the offdevice regression test build" * commit '886f8d3a33b94f86a5bd959fedda70fba4d9c7f1':
| | * | | | | am fd86a818: am 2ac06cc8: am 9ca0e511: am 086ffdcc: am 6c0e48b1: am ↵Ken Wakasa2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4350a93a: Merge "Fix the offdevice regression test build" * commit 'fd86a8184b478d1b7f89293adedc6533b6327353':
| | | * | | | am 2ac06cc8: am 9ca0e511: am 086ffdcc: am 6c0e48b1: am 4350a93a: Merge "Fix ↵Ken Wakasa2013-10-030-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the offdevice regression test build" * commit '2ac06cc87de104baece3e1150cea3a13054e0973':
* | | | | | | | am a37031e9: am 17a43baa: am d67439e7: am d00b457a: am 12f9d9cc: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f5d2ded: am a2174bad: am 5fa96540: Merge "Clear traverse sessions when closing." * commit 'a37031e95c5403aff14e3175e45ecca4b1e2a242':
| * | | | | | | am 17a43baa: am d67439e7: am d00b457a: am 12f9d9cc: am 6f5d2ded: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2174bad: am 5fa96540: Merge "Clear traverse sessions when closing." * commit '17a43baac08b2590fd5738df21de45b5f46f662f':
| | * | | | | | am d67439e7: am d00b457a: am 12f9d9cc: am 6f5d2ded: am a2174bad: am ↵Keisuke Kuroyanagi2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fa96540: Merge "Clear traverse sessions when closing." * commit 'd67439e727ac0b12b7004225630976295ce2e95a':
| | | * | | | | am d00b457a: am 12f9d9cc: am 6f5d2ded: am a2174bad: am 5fa96540: Merge ↵Keisuke Kuroyanagi2013-10-030-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Clear traverse sessions when closing." * commit 'd00b457ad0e103c678a7f8fea84e7158767a3c57':
* | | | | | | | | am 4a1f0e88: am 04adce21: am 79c8a62e: am e38eb43b: am 96652219: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d514c81: am c536d27c: am 6e41d9a4: Merge "Input delete onUpKey" * commit '4a1f0e88ba3bb26e6ba89a32429d1a914165bd43':
| * | | | | | | | am 04adce21: am 79c8a62e: am e38eb43b: am 96652219: am 2d514c81: am ↵Satoshi Kataoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c536d27c: am 6e41d9a4: Merge "Input delete onUpKey" * commit '04adce213aa8b81f13458cc6e7a218f71eaf3cdf':
| | * | | | | | | am 79c8a62e: am e38eb43b: am 96652219: am 2d514c81: am c536d27c: am ↵Satoshi Kataoka2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e41d9a4: Merge "Input delete onUpKey" * commit '79c8a62e04e30dec8852b6cfaa4329d25643e91c':
| | | * | | | | | am e38eb43b: am 96652219: am 2d514c81: am c536d27c: am 6e41d9a4: Merge ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Input delete onUpKey" * commit 'e38eb43ba56d87d6e8874a4ba02043dae03ad801':
* | | | | | | | | | am 661dd94f: am 06f0eeea: am c31d7269: am bff49c39: am 7988da37: am ↵Ken Wakasa2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 257f59fb: am b2956ef5: am 399422f4: Merge "Make Ver4DictEncoder write an address table of terminal nodes." * commit '661dd94fd2657901ad1e0a053fc0e10e9db77feb':
| * | | | | | | | | am 06f0eeea: am c31d7269: am bff49c39: am 7988da37: am 257f59fb: am ↵Ken Wakasa2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2956ef5: am 399422f4: Merge "Make Ver4DictEncoder write an address table of terminal nodes." * commit '06f0eeea2982d9bbc70ea34e5e604a2419646cc7':
| | * | | | | | | | am c31d7269: am bff49c39: am 7988da37: am 257f59fb: am b2956ef5: am ↵Ken Wakasa2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 399422f4: Merge "Make Ver4DictEncoder write an address table of terminal nodes." * commit 'c31d7269a4d704abaaa62d7451d034e5d7322437':
| | | * | | | | | | am bff49c39: am 7988da37: am 257f59fb: am b2956ef5: am 399422f4: Merge "Make ↵Ken Wakasa2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ver4DictEncoder write an address table of terminal nodes." * commit 'bff49c393b140d5fbb34d1bfaa377adcf7163b49':
* | | | | | | | | | | am 1b1561e7: am 399c2458: am e60f01a1: am 024ce454: am 652fcd56: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95c7dfd0: am 5512b300: am 1e69f3e6: Fix emoji page * commit '1b1561e70ada8c790ff0f42772b960c15aa4d7df':
| * | | | | | | | | | am 399c2458: am e60f01a1: am 024ce454: am 652fcd56: am 95c7dfd0: am ↵Satoshi Kataoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5512b300: am 1e69f3e6: Fix emoji page * commit '399c24580362204a37e33cab43661bdcd3c20b65':
| | * | | | | | | | | am e60f01a1: am 024ce454: am 652fcd56: am 95c7dfd0: am 5512b300: am ↵Satoshi Kataoka2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e69f3e6: Fix emoji page * commit 'e60f01a173d7035edf1b5747c7846582893354e0':
| | | * | | | | | | | am 024ce454: am 652fcd56: am 95c7dfd0: am 5512b300: am 1e69f3e6: Fix emoji pageSatoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '024ce4548c05f064ba4747bdf9d4098dad229686':
* | | | | | | | | | | | am 6b8255b5: am cefded69: am 266f4465: am 7423a791: am e39df0b2: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16c85695: am 400ec7c5: am 0938fb69: Allow gesture from the delete key * commit '6b8255b54790449b680b7eb7cfd1f65a1ff5a4f3':
| * | | | | | | | | | | am cefded69: am 266f4465: am 7423a791: am e39df0b2: am 16c85695: am ↵Satoshi Kataoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 400ec7c5: am 0938fb69: Allow gesture from the delete key * commit 'cefded69986a5194b3ea9a92ea8bcd02e18eaeb8':
| | * | | | | | | | | | am 266f4465: am 7423a791: am e39df0b2: am 16c85695: am 400ec7c5: am ↵Satoshi Kataoka2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0938fb69: Allow gesture from the delete key * commit '266f4465486d931a7896b3c9b34346ba86611e8e':
| | | * | | | | | | | | am 7423a791: am e39df0b2: am 16c85695: am 400ec7c5: am 0938fb69: Allow ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gesture from the delete key * commit '7423a7915ab81d746f85312c0450c5730045ad52':
* | | | | | | | | | | | | am f32a4c92: am 5302cc22: am 3296dcd0: am 32597669: am 90394a36: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73575763: am daa9eac9: am 9c3b2dbe: Fix emoji state * commit 'f32a4c92604636e2d516efbabade5da19f9d2b68':
| * | | | | | | | | | | | am 5302cc22: am 3296dcd0: am 32597669: am 90394a36: am 73575763: am ↵Satoshi Kataoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daa9eac9: am 9c3b2dbe: Fix emoji state * commit '5302cc22c66ebb05df257b3381fbdf1f152d19e6':
| | * | | | | | | | | | | am 3296dcd0: am 32597669: am 90394a36: am 73575763: am daa9eac9: am ↵Satoshi Kataoka2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c3b2dbe: Fix emoji state * commit '3296dcd06f7630d8d770d979f968aed486960fd5':
| | | * | | | | | | | | | am 32597669: am 90394a36: am 73575763: am daa9eac9: am 9c3b2dbe: Fix emoji stateSatoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '32597669b4cc65dd4114db0e30ae2b05e1611e79':
* | | | | | | | | | | | | | am a728e6ef: (-s ours) am 8ab939f9: (-s ours) am 2666e378: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 839fa5f3: (-s ours) am aca3b7a8: (-s ours) am 7b94f85a: (-s ours) am 6460cc71: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit 'a728e6efd7aa8c302a8b32ed4ed55ab14eee2544':
| * | | | | | | | | | | | | am 8ab939f9: (-s ours) am 2666e378: (-s ours) am 839fa5f3: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aca3b7a8: (-s ours) am 7b94f85a: (-s ours) am 6460cc71: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '8ab939f9d046582fd02b66ae2325161f713ef7f8':
| | * | | | | | | | | | | | am 2666e378: (-s ours) am 839fa5f3: (-s ours) am aca3b7a8: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b94f85a: (-s ours) am 6460cc71: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '2666e37892bc2ec40e5b8e7accb263325f35abcc':
| | | * | | | | | | | | | | am 839fa5f3: (-s ours) am aca3b7a8: (-s ours) am 7b94f85a: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6460cc71: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '839fa5f3a4b318398d940614d12054c0e05b20a7':
* | | | | | | | | | | | | | | am c78e7322: am 9941902a: am 2b2bbafe: am d640f02c: am 1e7f4089: am ↵Satoshi Kataoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b17084a4: am 0f75a055: am 431158c9: Turn off emoji palette on JB-MR2 * commit 'c78e7322aa1c6fc947f2c4cd63559c4d1d33f12b':
| * | | | | | | | | | | | | | am 9941902a: am 2b2bbafe: am d640f02c: am 1e7f4089: am b17084a4: am ↵Satoshi Kataoka2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f75a055: am 431158c9: Turn off emoji palette on JB-MR2 * commit '9941902ae6876a59c42eb482b7d2a733452087db':
| | * | | | | | | | | | | | | am 2b2bbafe: am d640f02c: am 1e7f4089: am b17084a4: am 0f75a055: am ↵Satoshi Kataoka2013-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 431158c9: Turn off emoji palette on JB-MR2 * commit '2b2bbafeb81c95f219669b06bbd532244f0962ce':
| | | * | | | | | | | | | | | am d640f02c: am 1e7f4089: am b17084a4: am 0f75a055: am 431158c9: Turn off ↵Satoshi Kataoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emoji palette on JB-MR2 * commit 'd640f02cb5525e49ece46b43db53cdadecd173b6':
* | | | | | | | | | | | | | | | am f9ddee4c: (-s ours) am 529056e4: (-s ours) am df8b7155: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf2b3063: (-s ours) am 11587e47: (-s ours) am 0693c6d2: (-s ours) am d484b1f4: (-s ours) am 46fdc6fd: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'f9ddee4ce54c6febe7fd6e5347a5722f45d55b76':
| * | | | | | | | | | | | | | | am 529056e4: (-s ours) am df8b7155: (-s ours) am cf2b3063: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11587e47: (-s ours) am 0693c6d2: (-s ours) am d484b1f4: (-s ours) am 46fdc6fd: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '529056e4c52a5e2699636a8eb41b6b49473c4717':