aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am fd2ea588: am 59ae862c: am 708e7b0d: am 448b28be: am ed0d1156: am ↵Tadashi G. Takaoka2013-09-260-0/+0
|\ | | | | | | | | | | 30f102e2: Move some attributes of setup wizard layouts to style files * commit 'fd2ea588ea88553635addb3658951658f8fc4fb5':
| * am 59ae862c: am 708e7b0d: am 448b28be: am ed0d1156: am 30f102e2: Move some ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ | | | | | | | | | | | | | | | attributes of setup wizard layouts to style files * commit '59ae862c8611f0c59fc40634347436b44e81ba4b':
* | | am 38484627: am 10d4986d: am e3407b75: am 64510ad9: am ae19f170: am ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | 1f6e06cf: Merge "Make setup wizard step number highlighted when activated" * commit '38484627e3350490cb07b3f07427c16240672a97':
| * | am 10d4986d: am e3407b75: am 64510ad9: am ae19f170: am 1f6e06cf: Merge "Make ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | setup wizard step number highlighted when activated" * commit '10d4986d075ec8982bfaef5619a722b2fe5879fd':
* | | | am db8c29d4: am 4c33e807: am 68067fce: am 8b085e7f: am 7158438a: am ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 88ee052c: Merge "Update strings of setup wizard" * commit 'db8c29d435171990bd434c6ca5ff0da00a5b59b6':
| * | | am 4c33e807: am 68067fce: am 8b085e7f: am 7158438a: am 88ee052c: Merge ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | "Update strings of setup wizard" * commit '4c33e80787b90e7428b90c1bfd16a7193c1db416':
* | | | | am 8c765113: (-s ours) am 3856755f: (-s ours) am 12b3ae1b: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97c48a10: (-s ours) am ef70fdd5: am 04211b91: (-s ours) am dcc59297: am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '8c765113d6699e86254353195a78d930f3054a14':
| * | | | am 3856755f: (-s ours) am 12b3ae1b: (-s ours) am 97c48a10: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef70fdd5: am 04211b91: (-s ours) am dcc59297: am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '3856755f2c402faaf6a2dca95bc92ab72e9412b8':
* | | | | | am 1d7997ba: (-s ours) am 052034e9: (-s ours) am 9183a408: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f87306b: (-s ours) am 3f4d2105: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '1d7997ba62160d80b2d2460bf08988c00baae242':
| * | | | | am 052034e9: (-s ours) am 9183a408: (-s ours) am 4f87306b: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f4d2105: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '052034e9b87b34ff29902e8f3d52ef74e064931c':
* | | | | | | am bcba9391: am 73b8411a: am c3425d97: am 3239d7f6: am 4f1a832d: am ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit 'bcba939114e385545fd62ef9492ca88750340d5c':
| * | | | | | am 73b8411a: am c3425d97: am 3239d7f6: am 4f1a832d: am f02e2693: am ↵Ken Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit '73b8411a7fc1e80629967377db1e3a97346027ee':
* | | | | | | | am be9d5d71: am b6584a6d: am c5645d67: am 1b1fc5d7: am 936fc9ab: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView * commit 'be9d5d71c17ce63aab57bfc01052d9f40bc6905e':
| * | | | | | | am b6584a6d: am c5645d67: am 1b1fc5d7: am 936fc9ab: am 3a18ae70: am ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView * commit 'b6584a6d3d84be22ac0d87afee01a2a9ddc02d7c':
* | | | | | | | | am 241050a8: am ef2f8ce6: am 0d3d8f53: am 52e0b3d1: am 0e64fbbc: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cf46864: Update dictionaries * commit '241050a8370c9b3d3209a6b2318b048ea0f34826':
| * | | | | | | | am ef2f8ce6: am 0d3d8f53: am 52e0b3d1: am 0e64fbbc: am 9cf46864: Update ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionaries * commit 'ef2f8ce67ceb2d0572009c5f3fcfbe2e3d7f126d':
* | | | | | | | | | am 485dc598: am c2052268: am c9848ad1: am a06fdaad: am 64e87b3e: am ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b2d184a: Merge "Update setup wizard icons" * commit '485dc5983af52a8c344104b10a933c0f8f7ac019':
| * | | | | | | | | am c2052268: am c9848ad1: am a06fdaad: am 64e87b3e: am 0b2d184a: Merge ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Update setup wizard icons" * commit 'c20522684ed8365ca1790a2f504d9cdc819ed91b':
* | | | | | | | | | | am 4aeb5601: am 9dcdd3ce: am 70ee9dc1: am 1efcbd67: am 8acab80a: am ↵Kurt Partridge2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56f35a10: Merge "Fix bug in counting words between samples" * commit '4aeb5601353cea3306231a6b953d251f332e6588':
| * | | | | | | | | | am 9dcdd3ce: am 70ee9dc1: am 1efcbd67: am 8acab80a: am 56f35a10: Merge "Fix ↵Kurt Partridge2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug in counting words between samples" * commit '9dcdd3ce930f80d38573837d659ea72fbb43bdf2':
* | | | | | | | | | | | am f3f8735b: am 787085d4: am fd140374: am bec53aa0: am 0163591d: am ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 550824c7: am 93c31e17: am 530fd15e: Fix bug to update last interpolated index of GestureStroke * commit 'f3f8735bf9f01c477b629039e9185c1b572a691f':
| * | | | | | | | | | | am 787085d4: am fd140374: am bec53aa0: am 0163591d: am 550824c7: am ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93c31e17: am 530fd15e: Fix bug to update last interpolated index of GestureStroke * commit '787085d4a319ecd60f0952cfcaab291d9458d902':
* | | | | | | | | | | | | am 96260e92: am b86c20e5: am 67f00c11: am 4e37f65f: am c986021b: am ↵The Android Automerger2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 453c70a2: am 17e55d3b: am 45fd237c: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle * commit '96260e92cd9c80874a6cf470a721889432b14c0a':
| * | | | | | | | | | | | am b86c20e5: am 67f00c11: am 4e37f65f: am c986021b: am 453c70a2: am ↵The Android Automerger2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17e55d3b: am 45fd237c: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle * commit 'b86c20e5a68140017244caaebe8eeca1d20c8577':
* | | | | | | | | | | | | | am 0b02eff7: am 3777ee6b: am 316908cb: am 48cda918: am af0d19b5: am ↵Tom Ouyang2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac37c939: am 05da1df8: am 880cb618: am 3970352e: Make digraph lookups case insensitive * commit '0b02eff78c255ea0d402070457121d14dca4d8fc':
| * | | | | | | | | | | | | am 3777ee6b: am 316908cb: am 48cda918: am af0d19b5: am ac37c939: am ↵Tom Ouyang2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05da1df8: am 880cb618: am 3970352e: Make digraph lookups case insensitive * commit '3777ee6ba1d7d31d194ee582e54166df653d1023':
* | | | | | | | | | | | | | | am 8d6131b5: am a10783fb: am ce343db9: am 4560a386: am a6058856: am ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6aac8ba7: am ad3ebcbd: am ef83a2eb: am e01e22e1: Merge "Update SORTED_CHAR_MAP" * commit '8d6131b5bd3a5e9c3ffc9c69433b38e51433edd0':
| * | | | | | | | | | | | | | am a10783fb: am ce343db9: am 4560a386: am a6058856: am 6aac8ba7: am ↵Ken Wakasa2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad3ebcbd: am ef83a2eb: am e01e22e1: Merge "Update SORTED_CHAR_MAP" * commit 'a10783fbd378ee8972df4f77b8c9007845303852':
* | | | | | | | | | | | | | | | am 33591fba: am d357269c: am 38a29eb3: am 390318fb: am 910bee79: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f08505af: am 38d52c0a: am a694c9ba: am ff766f8c: Merge "Don\'t insert automatic spaces when text looks like a URL" * commit '33591fba78bf7b4e5365c0686fcd05ef0679c22b':
| * | | | | | | | | | | | | | | am d357269c: am 38a29eb3: am 390318fb: am 910bee79: am f08505af: am ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38d52c0a: am a694c9ba: am ff766f8c: Merge "Don\'t insert automatic spaces when text looks like a URL" * commit 'd357269c0641b2c4401892c0a2b4f7901a86ca4e':
* | | | | | | | | | | | | | | | | am 8e923214: am dcc42bbf: am 2a7c8b90: am b1b9fc03: am f7e2ed72: am ↵Tadashi G. Takaoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b30137d: am 38046a0a: am 7abeccfa: am 1711f986: Merge "Add shadow to gesture preview trail" * commit '8e923214f342bb11f377e1aa46a3fc7abb26bdec':
| * | | | | | | | | | | | | | | | am dcc42bbf: am 2a7c8b90: am b1b9fc03: am f7e2ed72: am 5b30137d: am ↵Tadashi G. Takaoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38046a0a: am 7abeccfa: am 1711f986: Merge "Add shadow to gesture preview trail" * commit 'dcc42bbfe0413b1fe548513897bbce8c76216682':
* | | | | | | | | | | | | | | | | | am 37d3bcb9: am 4c6b7c50: am 80fade03: am 7e04bf26: am 8fa3fae2: am ↵Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1b9653b: am a23e25cc: am 93a429a7: am 252412d7: Use additional multi-word cost per language (for Russian) * commit '37d3bcb965562cc1ee860744b68d5906e79d61b4':
| * | | | | | | | | | | | | | | | | am 4c6b7c50: am 80fade03: am 7e04bf26: am 8fa3fae2: am e1b9653b: am ↵Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a23e25cc: am 93a429a7: am 252412d7: Use additional multi-word cost per language (for Russian) * commit '4c6b7c50d4bdf4c88d968adb11eed0e2415d6019':
* | | | | | | | | | | | | | | | | | | am 74d8aa93: am 64820842: am 79a64f35: am d45893bd: am eef11d43: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52a8f30e: am 7f8e55ec: am c6c17b93: am 962c9f05: Merge "Small cleanup" * commit '74d8aa934465a2588fc2faed033c6c0507f0a262':
| * | | | | | | | | | | | | | | | | | am 64820842: am 79a64f35: am d45893bd: am eef11d43: am 52a8f30e: am ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f8e55ec: am c6c17b93: am 962c9f05: Merge "Small cleanup" * commit '648208424ab6479f6cda90b990869d73fa46e67f':
* | | | | | | | | | | | | | | | | | | | am 5d70d126: am a95f6e84: am 4a794aa8: am 7925a5b1: am dae357aa: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 384450f7: am ca796e2d: am aa6924e9: am 78d65873: Merge "Don\'t recapitalize on shift while on symbol layout" * commit '5d70d126e7476f35d7acbaa5cdb5cfc41078fd03':
| * | | | | | | | | | | | | | | | | | | am a95f6e84: am 4a794aa8: am 7925a5b1: am dae357aa: am 384450f7: am ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca796e2d: am aa6924e9: am 78d65873: Merge "Don\'t recapitalize on shift while on symbol layout" * commit 'a95f6e84e409ec366e93340505620a0afee50e97':
* | | | | | | | | | | | | | | | | | | | | am d160a485: am dad133b5: am e66d563a: am 07866367: am 97c74e01: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 139f888d: am 074fee65: am cca43825: am 8094bf45: Match the keyboard state to the recapitalize state. * commit 'd160a48592163bdc94dd884d8887102fa2258b03':
| * | | | | | | | | | | | | | | | | | | | am dad133b5: am e66d563a: am 07866367: am 97c74e01: am 139f888d: am ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 074fee65: am cca43825: am 8094bf45: Match the keyboard state to the recapitalize state. * commit 'dad133b5fc595ae775e61ea7046e537b8bdb8c83':
* | | | | | | | | | | | | | | | | | | | | | am d96cf8fc: am 2769943d: am 49977c64: am 601edb48: am 31ba35f5: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3398ceef: am fe48f31e: am ced547f7: am e259b9f5: Merge "Clean up RecapitalizeStatus" * commit 'd96cf8fc1b9a4d3080b70e6905615d0d413f987a':
| * | | | | | | | | | | | | | | | | | | | | am 2769943d: am 49977c64: am 601edb48: am 31ba35f5: am 3398ceef: am ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe48f31e: am ced547f7: am e259b9f5: Merge "Clean up RecapitalizeStatus" * commit '2769943dbb83fb044f6ece40aaf375cfc257d86c':
* | | | | | | | | | | | | | | | | | | | | | | am 64165744: am 40e6fb73: am b7ec15c4: am 3257eb72: am ac397601: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 181bbf66: am 57ac9afc: am 8e5c6d70: am fd15686a: Merge "Fix an NPE" * commit '641657441b63516bd7a35a1d79d6d02e10399231':
| * | | | | | | | | | | | | | | | | | | | | | am 40e6fb73: am b7ec15c4: am 3257eb72: am ac397601: am 181bbf66: am ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57ac9afc: am 8e5c6d70: am fd15686a: Merge "Fix an NPE" * commit '40e6fb7327b23f8eb01219c64651a0f73cd5d032':
* | | | | | | | | | | | | | | | | | | | | | | | am 5adbdf2c: am f2ba6bac: am fcafe40e: am 9e17bb32: am 9c7fe5d3: am ↵Jean Chalard2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76ffd719: am 5557bf5b: am 10800d4b: am a024ac6b: Merge "Fix an NPE" * commit '5adbdf2cb45e1caed2cb9406e68d2663153e3d22':
| * | | | | | | | | | | | | | | | | | | | | | | am f2ba6bac: am fcafe40e: am 9e17bb32: am 9c7fe5d3: am 76ffd719: am ↵Jean Chalard2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5557bf5b: am 10800d4b: am a024ac6b: Merge "Fix an NPE" * commit 'f2ba6bac9e16b2052f1b91fedccb8a86dd8d68ea':
* | | | | | | | | | | | | | | | | | | | | | | | | am 4176db82: (-s ours) am 7abed7f7: (-s ours) am af54a286: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2203df69: (-s ours) am 5f2f3356: am 7eb5ed78: (-s ours) am 895fca8f: am 7cb72808: am 785c5068: (-s ours) am 5eb28c19: am a130057b: Import translations. DO NOT MERGE * commit '4176db829f80cff4c0f58c266535103b7eb2401e':
| * | | | | | | | | | | | | | | | | | | | | | | | am 7abed7f7: (-s ours) am af54a286: (-s ours) am 2203df69: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f2f3356: am 7eb5ed78: (-s ours) am 895fca8f: am 7cb72808: am 785c5068: (-s ours) am 5eb28c19: am a130057b: Import translations. DO NOT MERGE * commit '7abed7f7782721e7a553ad0ce72d4c3f4307a355':
* | | | | | | | | | | | | | | | | | | | | | | | | | am ac8a1cba: (-s ours) am 8d04cb97: (-s ours) am 28feb5e3: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a55ea12: (-s ours) am ed3b0c1f: am 50190e4d: (-s ours) am 590fb058: am d611d681: am fd2b08c7: (-s ours) Import translations. DO NOT MERGE * commit 'ac8a1cbad874b7abbcdff20fbd137615d8a1901f':
| * | | | | | | | | | | | | | | | | | | | | | | | | am 8d04cb97: (-s ours) am 28feb5e3: (-s ours) am 2a55ea12: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed3b0c1f: am 50190e4d: (-s ours) am 590fb058: am d611d681: am fd2b08c7: (-s ours) Import translations. DO NOT MERGE * commit '8d04cb9723e8cfcbdbd55ba21702647a4d6f323f':