aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 363394c9: am 04708a32: am d1935d05: am d0642a34: am 775ef9bc: am ↵Satoshi Kataoka2013-05-150-0/+0
|\ | | | | | | | | | | cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname" * commit '363394c9b3ba0652f52a03bafd07470c1ad8c473':
| * am 04708a32: am d1935d05: am d0642a34: am 775ef9bc: am cb132ce1: am ↵Satoshi Kataoka2013-05-150-0/+0
| |\ | | | | | | | | | | | | | | | 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname" * commit '04708a3216945e6e695b7421f56f5fd6b30cf5b0':
| | * am d1935d05: am d0642a34: am 775ef9bc: am cb132ce1: am 81295fd2: am ↵Satoshi Kataoka2013-05-150-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname" * commit 'd1935d05483e71610146eedb54074406178ea916':
* | | | am 4a12a2b6: am bfb18559: am 37232a10: am 58db8c60: am c0d71c3b: am ↵Tadashi G. Takaoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import * commit '4a12a2b6b66a079b16ad10452d318f8a401392df':
| * | | am bfb18559: am 37232a10: am 58db8c60: am c0d71c3b: am 3a2e78f9: am ↵Tadashi G. Takaoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import * commit 'bfb1855908d99e4ddb07a652bda3a9ccc76c4902':
| | * | am 37232a10: am 58db8c60: am c0d71c3b: am 3a2e78f9: am 30d9817b: am ↵Tadashi G. Takaoka2013-05-150-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import * commit '37232a10d27fe87fac16271c3ce6e91df5d77e6a':
* | | | | am 05e54e59: am 9faf1961: am c1e417dd: am e010bb8a: am 18be37b0: am ↵Tadashi G. Takaoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96d53923: am 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" * commit '05e54e59b3145b317aa8ff7d6013251e7e188810':
| * | | | am 9faf1961: am c1e417dd: am e010bb8a: am 18be37b0: am 96d53923: am ↵Tadashi G. Takaoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" * commit '9faf1961bfd5b30fd73c66e7fa873262c7baee13':
| | * | | am c1e417dd: am e010bb8a: am 18be37b0: am 96d53923: am 104923e4: am ↵Tadashi G. Takaoka2013-05-150-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" * commit 'c1e417dd2b2ca0046f9c0202ab5d06445bbe6b90':
* | | | | | am e0e7b78f: am eecbcea7: am 4bb35fea: am 8e8ea448: am 9e78d2ba: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54f46879: am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource" * commit 'e0e7b78f835100378b4d436d759105280575c3c8':
| * | | | | am eecbcea7: am 4bb35fea: am 8e8ea448: am 9e78d2ba: am 54f46879: am ↵Satoshi Kataoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource" * commit 'eecbcea7a9357696a68eaa0f0b7b859c4516f247':
| | * | | | am 4bb35fea: am 8e8ea448: am 9e78d2ba: am 54f46879: am 1af04dc6: am ↵Satoshi Kataoka2013-05-150-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource" * commit '4bb35fea2db5b34dd95f58c756a8dd6331ced17d':
* | | | | | | am dbff15a9: am af1ca413: am daad9c68: am 5bc76be0: am 15a357a3: am ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd458 * commit 'dbff15a95eb1031998fa2de97195851bae10ba82':
| * | | | | | am af1ca413: am daad9c68: am 5bc76be0: am 15a357a3: am 2060aa13: am ↵Baligh Uddin2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f6 * commit 'af1ca4138a1b21ecb4344b4cb1a4bf965a417f8d':
| | * | | | | am daad9c68: am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am ↵Baligh Uddin2013-05-150-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' in * commit 'daad9c687ed5857588bade9b71c8e2b74e1b605e':
* | | | | | | | am 32d5b4e3: am 29370f41: am 204243c3: am 071c3c6d: am e8374789: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname" * commit '32d5b4e39beec72c92f650e7e118346d1a5eaa36':
| * | | | | | | am 29370f41: am 204243c3: am 071c3c6d: am e8374789: am 9e45f9e8: am ↵Satoshi Kataoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname" * commit '29370f41502f8c4b278314c43a0659201f9a4121':
| | * | | | | | am 204243c3: am 071c3c6d: am e8374789: am 9e45f9e8: am 24cf39e7: am ↵Satoshi Kataoka2013-05-150-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname" * commit '204243c3e11d1c1933ee146a7bb511230ce226c9':
* | | | | | | | | am e9716016: am 217fe877: am eeb0459e: am a446f8f7: am fd06763b: am ↵Tadashi G. Takaoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder * commit 'e97160165713cae2b60112299bd72088dd2ff445':
| * | | | | | | | am 217fe877: am eeb0459e: am a446f8f7: am fd06763b: am 7bc7bd79: am ↵Tadashi G. Takaoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder * commit '217fe8773b7cf473c900aec016500d7b3509e828':
| | * | | | | | | am eeb0459e: am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am ↵Tadashi G. Takaoka2013-05-150-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder * commit 'eeb0459e68d6c9a8654d3fd76561814c4dbb2399':
* | | | | | | | | | am 461a0480: am be7561c2: am 41b61150: am adef73a7: am eb2fee1d: am ↵The Android Open Source Project2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7db5bfa0: am 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b * commit '461a0480c431f246f040d095a5d7dc57b62b460b':
| * | | | | | | | | am be7561c2: am 41b61150: am adef73a7: am eb2fee1d: am 7db5bfa0: am ↵The Android Open Source Project2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) * commit 'be7561c240071d559a0189b471d47f09948af358':
| | * | | | | | | | am 41b61150: am adef73a7: am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) ↵The Android Open Source Project2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile wit * commit '41b61150d0a395bc466361099a841ab187b80859':
* | | | | | | | | | | am 74f99743: am 77deeefe: am 3694cc82: am e4f98a02: am 79ef0a17: am ↵Alan Viverette2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b45830a: am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a * commit '74f9974337b8d87fc4fd1f150cc3987a0975cbec':
| * | | | | | | | | | am 77deeefe: am 3694cc82: am e4f98a02: am 79ef0a17: am 4b45830a: am ↵Alan Viverette2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard * commit '77deeefe8e39c054585490c6ef499fa8e458aebd':
| | * | | | | | | | | am 3694cc82: am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am ↵Alan Viverette2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. * commit '3694cc826a239e9860a7e57adaf76b494f4df9bd':
* | | | | | | | | | | | am 97b579d5: am efd85328: (-s ours) am c825c557: am b2af86cf: (-s ours) am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NO * commit '97b579d5c55ae24e2b567bd86c795e98bb7cfba4':
| * | | | | | | | | | | am efd85328: (-s ours) am c825c557: am b2af86cf: (-s ours) am c5424013: am ↵Jean Chalard2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase strin * commit 'efd853284bee2f8d15df578862c2a2df4d61fb31':
| | * | | | | | | | | | am c825c557: am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: ↵Jean Chalard2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" int * commit 'c825c55779455e17ca85e526b9c5ed8ad95dd60b':
* | | | | | | | | | | | | am 66833def: am dd0e671a: am 30439651: am a4156a8e: am 5a59a986: am ↵Jean Chalard2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits" * commit '66833def373e68917a7a5eb2fe99966c4aba3c08':
| * | | | | | | | | | | | am dd0e671a: am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am ↵Jean Chalard2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits" * commit 'dd0e671af3d3675b2e8e7f2fa70c533c35fc7710':
| | * | | | | | | | | | | am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am ↵Jean Chalard2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits" * commit '30439651658d0c676f650b38ae92ea8553712f21':
* | | | | | | | | | | | | | am 7916a5d2: am 6da2f050: (-s ours) am 79971a1f: am 8a0205e2: (-s ours) am ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d607977: am e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import transl * commit '7916a5d27dda6785e91b77940a230040f2247fdb':
| * | | | | | | | | | | | | am 6da2f050: (-s ours) am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: am ↵Baligh Uddin2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE * commit '6da2f050df7895f1e78575087c455595546f53a1':
| | * | | | | | | | | | | | am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: ↵Baligh Uddin2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE * commit '79971a1f25f258a1fa5f0e8dd89dc7a73e74a4b7':
* | | | | | | | | | | | | | | am 7a68cf1e: (-s ours) am 6686f6ee: (-s ours) am ea151032: am 4d085cfa: (-s ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE * commit '7a68cf1e2f94f063777cdf3434159b6a2ca08257':
| * | | | | | | | | | | | | | am 6686f6ee: (-s ours) am ea151032: am 4d085cfa: (-s ours) am ffb269b1: am ↵Baligh Uddin2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE * commit '6686f6eeb0e757a6cf016d80675f6bc0148762b8':
| | * | | | | | | | | | | | | am ea151032: am 4d085cfa: (-s ours) am ffb269b1: am 3df28d14: am 14d778b2: ↵Baligh Uddin2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE * commit 'ea1510321df75995233477469f5021e8cd09d359':
* | | | | | | | | | | | | | | | am 39177323: (-s ours) am 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ↵Baligh Uddin2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE * commit '39177323d047b02e2f690b4cbde9b392252fb28a':
| * | | | | | | | | | | | | | | am 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am ↵Baligh Uddin2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE * commit '4c2b9e46d769b829a74f02484697d3bede2f15f4':
| | * | | | | | | | | | | | | | am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: ↵Baligh Uddin2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE * commit 'e0789c736becc6be61c3edcb995bcb19240ff248':
* | | | | | | | | | | | | | | | | am 8af0cc2e: am 9da909d1: am dcfff5c0: am 4109952b: am 7a4430ac: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit '8af0cc2e01dfe34483111f4d2d035843492e0251':
| * | | | | | | | | | | | | | | | am 9da909d1: am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am ↵Satoshi Kataoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit '9da909d187cfc505bef7cea80215fd3b8ce2df86':
| | * | | | | | | | | | | | | | | am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am ↵Satoshi Kataoka2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit 'dcfff5c0d28345891f3324f29d0edaa92c03fb2d':
* | | | | | | | | | | | | | | | | | am 795895e1: am f368fdb6: am 3d82dbca: am d3022faf: am 01eb9b25: am ↵Satoshi Kataoka2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit '795895e157267b0fcc360d9099304656e3becdc2':
| * | | | | | | | | | | | | | | | | am f368fdb6: am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am ↵Satoshi Kataoka2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit 'f368fdb6d55b0155a4df00a5b625f186ccf23ca0':
| | * | | | | | | | | | | | | | | | am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am ↵Satoshi Kataoka2013-05-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit '3d82dbcaaef28d3ac201d8c5d312110aa4898280':
* | | | | | | | | | | | | | | | | | | am 4d4cb019: am c68eb70a: am 023bee60: am abf64529: am 66366029: am ↵Kurt Partridge2013-05-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView" * commit '4d4cb0195b5e07f5df3f67e3428399e6c07cd01b':
| * | | | | | | | | | | | | | | | | | am c68eb70a: am 023bee60: am abf64529: am 66366029: am a6092dc8: am ↵Kurt Partridge2013-05-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView" * commit 'c68eb70ae2fe54e495c70c7e8603025e5a690b43':