aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 9a030f86: am f650f359: am 938fe9b5: am ce957e05: am c436f3a1: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a835efc: am ff078041: am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev * commit '9a030f86a6aa80829653ee2b59a0f157a8d89c47':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 c054cd7e: am 4c5753b2: am 32f2ea14: am c6f4f13e: am 7bb6c903: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7abaafe: am e5cbdfe1: am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev * commit 'c054cd7e0f380993ee02b476752e336d2d9fc684':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 e4cbf9ec: am 6b6fb329: am 8cff4b77: am 48973cc7: am 8f9a8734: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fc2ca29d: am f10046bd: Remove ScrollView from setup wizard * commit 'e4cbf9ec025c252d6d85eb647106a4d7c5269814':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 5e883d06: am fd2ea588: am 59ae862c: am 708e7b0d: am 448b28be: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files * commit '5e883d06d2e3dc21c8e901b5d75c3e202438087a':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 98db6091: am 38484627: am 10d4986d: am e3407b75: am 64510ad9: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated" * commit '98db6091128b6a10e58de1e6a3a8f58f35ce09ac':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 3a25db77: am db8c29d4: am 4c33e807: am 68067fce: am 8b085e7f: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7158438a: am 88ee052c: Merge "Update strings of setup wizard" * commit '3a25db77ad31be2cd7bf59783b5e97aef7bfb9ae':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 1de7860b: (-s ours) am 8c765113: (-s ours) am 3856755f: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '1de7860b6aaa3b4e58ba5f75fe511cd21b02895e':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 d93e39df: (-s ours) am 1d7997ba: (-s ours) am 052034e9: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9183a408: (-s ours) am 4f87306b: (-s ours) am 3f4d2105: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit 'd93e39df0beca97f93085bd0a12a918d008d8ac4':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 afe838e8: am bcba9391: am 73b8411a: am c3425d97: am 3239d7f6: am ↵Ken Wakasa2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f1a832d: am f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev * commit 'afe838e8360f355fdc8b3ed34f33fc863006ae46':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1060a8a6: am 8eef0934: am c9f4b9fd: am be9d5d71: am b6584a6d: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5645d67: am 1b1fc5d7: am 936fc9ab: am 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView * commit '1060a8a617e4292884f85f536bc31c8bc37c4e0b':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8eef0934: am c9f4b9fd: am be9d5d71: am b6584a6d: am c5645d67: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b1fc5d7: am 936fc9ab: am 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView * commit '8eef093430d883617ae0f83875a314b70780d7b7':
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c9f4b9fd: am be9d5d71: am b6584a6d: am c5645d67: am 1b1fc5d7: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 936fc9ab: am 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView * commit 'c9f4b9fd5aa0fd5cfb8a902b4340b1fc73799b88':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bfe2958f: am a5bbad8f: am 6f835f65: am 7e9f08b1: am 241050a8: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef2f8ce6: am 0d3d8f53: am 52e0b3d1: am 0e64fbbc: am 9cf46864: Update dictionaries * commit 'bfe2958f5d1321fa3d4ac33c8b7384b701a06ddf':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a5bbad8f: am 6f835f65: am 7e9f08b1: am 241050a8: am ef2f8ce6: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d3d8f53: am 52e0b3d1: am 0e64fbbc: am 9cf46864: Update dictionaries * commit 'a5bbad8f7d3f14e66216757c8de876727aa24b52':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6f835f65: am 7e9f08b1: am 241050a8: am ef2f8ce6: am 0d3d8f53: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52e0b3d1: am 0e64fbbc: am 9cf46864: Update dictionaries * commit '6f835f650eb3f1c632c7e7dcb65860f09fd2930e':
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7e9f08b1: am 241050a8: am ef2f8ce6: am 0d3d8f53: am 52e0b3d1: am ↵Jean Chalard2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e64fbbc: am 9cf46864: Update dictionaries * commit '7e9f08b19a5ece66ef76390af1b7dcb1113825f6':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cdc7e24f: am 8c874504: am cd81ac9c: am cc138a5f: am 485dc598: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2052268: am c9848ad1: am a06fdaad: am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons" * commit 'cdc7e24fdd7f86e0fdc05da08b0885ec7dbcb1e7':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8c874504: am cd81ac9c: am cc138a5f: am 485dc598: am c2052268: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9848ad1: am a06fdaad: am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons" * commit '8c874504ef909b66e2fa5956806f638f87624d15':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cd81ac9c: am cc138a5f: am 485dc598: am c2052268: am c9848ad1: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a06fdaad: am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons" * commit 'cd81ac9cb01a87f50387546923ca9769aefcbc16':
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cc138a5f: am 485dc598: am c2052268: am c9848ad1: am a06fdaad: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons" * commit 'cc138a5fff5f18efa7b6180ff02c491f76f54f9c':
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d6a7426f: am c064f022: am b0055a06: am b410aab6: am 4aeb5601: am ↵Kurt Partridge2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dcdd3ce: am 70ee9dc1: am 1efcbd67: am 8acab80a: am 56f35a10: Merge "Fix bug in counting words between samples" * commit 'd6a7426f0cd955934473ea8e1f6f70dc2cd57831':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c064f022: am b0055a06: am b410aab6: am 4aeb5601: am 9dcdd3ce: am ↵Kurt Partridge2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70ee9dc1: am 1efcbd67: am 8acab80a: am 56f35a10: Merge "Fix bug in counting words between samples" * commit 'c064f02248cf9eea73adc038d821642375da975b':