aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c5c3d47f: am 5de837a3: am 67a3d16a: am 9717ec96: am f2dd3ed1: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\ | | | | | | | | | | a1bc667a: am 5475b828: am eae3172a: am e8469732: am b3663df5: am 68e4de1e: Add welcome screen to setup wizard * commit 'c5c3d47f636f861a2c21f5739717a7956f8e238c':
| * am 5de837a3: am 67a3d16a: am 9717ec96: am f2dd3ed1: am a1bc667a: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\ | | | | | | | | | | | | | | | 5475b828: am eae3172a: am e8469732: am b3663df5: am 68e4de1e: Add welcome screen to setup wizard * commit '5de837a3aedf314ce8d1740fc91a303b79b6dcfe':
| | * am 67a3d16a: am 9717ec96: am f2dd3ed1: am a1bc667a: am 5475b828: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | eae3172a: am e8469732: am b3663df5: am 68e4de1e: Add welcome screen to setup wizard * commit '67a3d16ae3eba628bc40807532594ca1e9962546':
| | | * am 9717ec96: am f2dd3ed1: am a1bc667a: am 5475b828: am eae3172a: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | e8469732: am b3663df5: am 68e4de1e: Add welcome screen to setup wizard * commit '9717ec96ffb2339d26291eef2ba76cf6ae32df1d':
* | | | | am 80888cf9: am 08d13623: am 284ef541: am f6ff0a09: am 4aed99fd: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0deeb4ce: am 23c5a47e: am cd1e44b6: am b2f8f66f: am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen * commit '80888cf9f64aa471c2d1a80664b3c3c102f33c1f':
| * | | | am 08d13623: am 284ef541: am f6ff0a09: am 4aed99fd: am 0deeb4ce: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 23c5a47e: am cd1e44b6: am b2f8f66f: am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen * commit '08d13623b3c8fa31a51983e79f6751e489c82f6b':
| | * | | am 284ef541: am f6ff0a09: am 4aed99fd: am 0deeb4ce: am 23c5a47e: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | cd1e44b6: am b2f8f66f: am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen * commit '284ef54152731daa9a674e7d08bb062dd26c7b93':
| | | * | am f6ff0a09: am 4aed99fd: am 0deeb4ce: am 23c5a47e: am cd1e44b6: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2f8f66f: am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen * commit 'f6ff0a097faf0ca794e28ede0282ed1063370330':
* | | | | | am ba8ac2ed: am 6bcf315f: am f32f75c7: am bc19d290: am 4b546c61: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e519cf3: am 854227ac: am a3768015: am 680fa7ba: am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard" * commit 'ba8ac2edd085f37fc92ef87db1624355d9cc5d1a':
| * | | | | am 6bcf315f: am f32f75c7: am bc19d290: am 4b546c61: am 8e519cf3: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 854227ac: am a3768015: am 680fa7ba: am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard" * commit '6bcf315fd3b2905037fd369378391c8ebb406479':
| | * | | | am f32f75c7: am bc19d290: am 4b546c61: am 8e519cf3: am 854227ac: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3768015: am 680fa7ba: am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard" * commit 'f32f75c7165de7da92a4216dc2255a9de5cdef80':
| | | * | | am bc19d290: am 4b546c61: am 8e519cf3: am 854227ac: am a3768015: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 680fa7ba: am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard" * commit 'bc19d2905fcdbf0a5c1b417fc52ec234d4a3479e':
* | | | | | | am a7bdb35b: am 51b3fd40: am 00d78b87: am a5283e19: am 9a030f86: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f650f359: am 938fe9b5: am ce957e05: am c436f3a1: am 1a835efc: am ff078041: am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev * commit 'a7bdb35b62267c9caab60d6d73a304ddd104da2f':
| * | | | | | am 51b3fd40: am 00d78b87: am a5283e19: am 9a030f86: am f650f359: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 938fe9b5: am ce957e05: am c436f3a1: am 1a835efc: am ff078041: am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev * commit '51b3fd40dc94da8d191979d53084b5a92c181c6b':
| | * | | | | am 00d78b87: am a5283e19: am 9a030f86: am f650f359: am 938fe9b5: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce957e05: am c436f3a1: am 1a835efc: am ff078041: am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev * commit '00d78b87d942dbd5cfee7fe589a5d4e54f8678c2':
| | | * | | | am a5283e19: am 9a030f86: am f650f359: am 938fe9b5: am ce957e05: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c436f3a1: am 1a835efc: am ff078041: am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev * commit 'a5283e195dceb553462026af13010b62b573a9c2':
* | | | | | | | am 4c997f05: am 4e213389: am 2a11dabc: am 2e540372: am c054cd7e: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c5753b2: am 32f2ea14: am c6f4f13e: am 7bb6c903: am b7abaafe: am e5cbdfe1: am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev * commit '4c997f052f884907c479108add1c1f0bcc56194d':
| * | | | | | | am 4e213389: am 2a11dabc: am 2e540372: am c054cd7e: am 4c5753b2: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32f2ea14: am c6f4f13e: am 7bb6c903: am b7abaafe: am e5cbdfe1: am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev * commit '4e213389b9f2a1dd149a44f428317815432a8fb9':
| | * | | | | | am 2a11dabc: am 2e540372: am c054cd7e: am 4c5753b2: am 32f2ea14: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c6f4f13e: am 7bb6c903: am b7abaafe: am e5cbdfe1: am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev * commit '2a11dabca2cc246f1d595e21d0218e196f62db86':
| | | * | | | | am 2e540372: am c054cd7e: am 4c5753b2: am 32f2ea14: am c6f4f13e: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bb6c903: am b7abaafe: am e5cbdfe1: am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev * commit '2e54037257f031c03299243fa79264ab37cfa182':
* | | | | | | | | am 7bd53c61: am c9da8866: am 4f44466b: am e610e392: am e4cbf9ec: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b6fb329: am 8cff4b77: am 48973cc7: am 8f9a8734: am fc2ca29d: am f10046bd: Remove ScrollView from setup wizard * commit '7bd53c6129765cbfff088b36fee214f57f776077':
| * | | | | | | | am c9da8866: am 4f44466b: am e610e392: am e4cbf9ec: am 6b6fb329: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cff4b77: am 48973cc7: am 8f9a8734: am fc2ca29d: am f10046bd: Remove ScrollView from setup wizard * commit 'c9da88663dcb16ec44c9d83bfa5746067893a0ea':
| | * | | | | | | am 4f44466b: am e610e392: am e4cbf9ec: am 6b6fb329: am 8cff4b77: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48973cc7: am 8f9a8734: am fc2ca29d: am f10046bd: Remove ScrollView from setup wizard * commit '4f44466bb8585d09d62796c510ad58c960a8f589':
| | | * | | | | | am e610e392: am e4cbf9ec: am 6b6fb329: am 8cff4b77: am 48973cc7: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f9a8734: am fc2ca29d: am f10046bd: Remove ScrollView from setup wizard * commit 'e610e39240e64b6aa38d60a2c5ee31eb9b3dc234':
* | | | | | | | | | am ba095b5d: am a8158a9f: am 2a661d8b: am 3cd9c140: am 5e883d06: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd2ea588: am 59ae862c: am 708e7b0d: am 448b28be: am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files * commit 'ba095b5d4e2b4fb5039dda4f204c19e921e4d701':
| * | | | | | | | | am a8158a9f: am 2a661d8b: am 3cd9c140: am 5e883d06: am fd2ea588: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59ae862c: am 708e7b0d: am 448b28be: am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files * commit 'a8158a9fa7b58a422151aebb408bdecb8911e02b':
| | * | | | | | | | am 2a661d8b: am 3cd9c140: am 5e883d06: am fd2ea588: am 59ae862c: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 708e7b0d: am 448b28be: am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files * commit '2a661d8b26ad5a898908a3be76f6c58dbe45eb42':
| | | * | | | | | | am 3cd9c140: am 5e883d06: am fd2ea588: am 59ae862c: am 708e7b0d: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 448b28be: am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files * commit '3cd9c140743013d40d4b67cfcb2c94a658b8ee18':
* | | | | | | | | | | am abd8afa2: am bdcf05b4: am de84d8f9: am 153c0230: am 98db6091: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38484627: am 10d4986d: am e3407b75: am 64510ad9: am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated" * commit 'abd8afa22688bb930c645914406eb3a22a9a0b63':
| * | | | | | | | | | am bdcf05b4: am de84d8f9: am 153c0230: am 98db6091: am 38484627: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10d4986d: am e3407b75: am 64510ad9: am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated" * commit 'bdcf05b4bc845e00d23ea766291e3bf2d0ae81d0':
| | * | | | | | | | | am de84d8f9: am 153c0230: am 98db6091: am 38484627: am 10d4986d: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3407b75: am 64510ad9: am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated" * commit 'de84d8f9bbe2556e53a19948a6aa9ad311094a50':
| | | * | | | | | | | am 153c0230: am 98db6091: am 38484627: am 10d4986d: am e3407b75: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64510ad9: am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated" * commit '153c0230dde2bf18538c4282228f30d3250bdbac':
* | | | | | | | | | | | am 0ad7f698: am 2fea38af: am 5c304910: am 06eadd26: am 3a25db77: am ↵Tadashi G. Takaoka2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db8c29d4: am 4c33e807: am 68067fce: am 8b085e7f: am 7158438a: am 88ee052c: Merge "Update strings of setup wizard" * commit '0ad7f698c0b572b2671cf35a84942d9fd4012b86':
| * | | | | | | | | | | am 2fea38af: am 5c304910: am 06eadd26: am 3a25db77: am db8c29d4: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c33e807: am 68067fce: am 8b085e7f: am 7158438a: am 88ee052c: Merge "Update strings of setup wizard" * commit '2fea38af16ac75e1d2f5ef0365dc6c4193f30784':
| | * | | | | | | | | | am 5c304910: am 06eadd26: am 3a25db77: am db8c29d4: am 4c33e807: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68067fce: am 8b085e7f: am 7158438a: am 88ee052c: Merge "Update strings of setup wizard" * commit '5c304910e2e50632a049363efc64064feb614a66':
| | | * | | | | | | | | am 06eadd26: am 3a25db77: am db8c29d4: am 4c33e807: am 68067fce: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b085e7f: am 7158438a: am 88ee052c: Merge "Update strings of setup wizard" * commit '06eadd269da021d2a00693fe71ecb986b330ceca':
* | | | | | | | | | | | | am 47cc6d6e: am 120d48d7: am c4285ab5: (-s ours) am cb5f9318: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1de7860b: (-s ours) am 8c765113: (-s ours) am 3856755f: (-s ours) am 12b3ae1b: (-s ours) am 97c48a10: (-s ours) am ef70fdd5: am 04211b91: (-s ours) am dcc59297: am 1844bec2: Merge "Import trans * commit '47cc6d6e40a2c9d83c39e284989bd6a8f9b21f99':
| * | | | | | | | | | | | am 120d48d7: am c4285ab5: (-s ours) am cb5f9318: (-s ours) am 1de7860b: (-s ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) am 8c765113: (-s ours) am 3856755f: (-s ours) am 12b3ae1b: (-s ours) am 97c48a10: (-s ours) am ef70fdd5: am 04211b91: (-s ours) am dcc59297: am 1844bec2: Merge "Import translations. DO N * commit '120d48d7233edbab365d91bdf4756176a9e31bb7':
| | * | | | | | | | | | | am c4285ab5: (-s ours) am cb5f9318: (-s ours) am 1de7860b: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c765113: (-s ours) am 3856755f: (-s ours) am 12b3ae1b: (-s ours) am 97c48a10: (-s ours) am ef70fdd5: am 04211b91: (-s ours) am dcc59297: am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-d * commit 'c4285ab542340f732cd06d2b90d791ce2a64508f':
| | | * | | | | | | | | | am cb5f9318: (-s ours) am 1de7860b: (-s ours) am 8c765113: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3856755f: (-s ours) am 12b3ae1b: (-s ours) am 97c48a10: (-s ours) am ef70fdd5: am 04211b91: (-s ours) am dcc59297: am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'cb5f9318b2fa0ed3b457e434ab6f3c76de47eacc':
* | | | | | | | | | | | | | am 43df4466: (-s ours) am 610aefd5: (-s ours) am 2b17c3bf: (-s ours) am ↵Baligh Uddin2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07aaf165: (-s ours) am d93e39df: (-s ours) am 1d7997ba: (-s ours) am 052034e9: (-s ours) am 9183a408: (-s ours) am 4f87306b: (-s ours) am 3f4d2105: (-s ours) Merge "Import translations. DO NOT MERGE" into j * commit '43df4466e7fc784ee2189226f3b5951a6997593e':
| * | | | | | | | | | | | | am 610aefd5: (-s ours) am 2b17c3bf: (-s ours) am 07aaf165: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d93e39df: (-s ours) am 1d7997ba: (-s ours) am 052034e9: (-s ours) am 9183a408: (-s ours) am 4f87306b: (-s ours) am 3f4d2105: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '610aefd5c469beb4aa9860efeb8f3d1823fab7a8':
| | * | | | | | | | | | | | am 2b17c3bf: (-s ours) am 07aaf165: (-s ours) am d93e39df: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d7997ba: (-s ours) am 052034e9: (-s ours) am 9183a408: (-s ours) am 4f87306b: (-s ours) am 3f4d2105: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '2b17c3bf22a31edebb386cda0ac933b991eab23d':
| | | * | | | | | | | | | | am 07aaf165: (-s ours) am d93e39df: (-s ours) am 1d7997ba: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 052034e9: (-s ours) am 9183a408: (-s ours) am 4f87306b: (-s ours) am 3f4d2105: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '07aaf16571eb70d89ea803980dbb3a0839967e59':
* | | | | | | | | | | | | | | am d493f255: am f1519ba0: am cd7dadb8: am b3fd4401: am afe838e8: am ↵Ken Wakasa2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcba9391: am 73b8411a: am c3425d97: am 3239d7f6: am 4f1a832d: am f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit 'd493f255fdb682f47f19aec2a0720ffaeb755f30':
| * | | | | | | | | | | | | | am f1519ba0: am cd7dadb8: am b3fd4401: am afe838e8: am bcba9391: am ↵Ken Wakasa2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73b8411a: am c3425d97: am 3239d7f6: am 4f1a832d: am f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit 'f1519ba0dd2987afa3c35da285704d8e77293645':
| | * | | | | | | | | | | | | am cd7dadb8: am b3fd4401: am afe838e8: am bcba9391: am 73b8411a: am ↵Ken Wakasa2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3425d97: am 3239d7f6: am 4f1a832d: am f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit 'cd7dadb8d2fec6cd6db35c3484aeb8e9aae6eaf4':
| | | * | | | | | | | | | | | am b3fd4401: am afe838e8: am bcba9391: am 73b8411a: am c3425d97: am ↵Ken Wakasa2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3239d7f6: am 4f1a832d: am f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit 'b3fd44010941a712b16bfa5f207d25e228ecdb27':
* | | | | | | | | | | | | | | | am d8484f48: am 5ea8667c: am 1060a8a6: am 8eef0934: am c9f4b9fd: am ↵Jean Chalard2013-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be9d5d71: am b6584a6d: am c5645d67: am 1b1fc5d7: am 936fc9ab: am 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView * commit 'd8484f48910364b6d909bf1d8bf8f8647bd2238c':
| * | | | | | | | | | | | | | | am 5ea8667c: am 1060a8a6: am 8eef0934: am c9f4b9fd: am be9d5d71: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6584a6d: am c5645d67: am 1b1fc5d7: am 936fc9ab: am 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView * commit '5ea8667c2a2b2bdf7860933cd3655760d8884ceb':