aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c82913a7: am d1fc691c: am 94e383bb: am 276547da: am 0bd99dad: am ↵Baligh Uddin2013-10-030-0/+0
|\ | | | | | | | | | | dbff15a9: am af1ca413: am daad9c68: am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47 * commit 'c82913a773d36e7541282d91853115408095b4d9':
| * am d1fc691c: am 94e383bb: am 276547da: am 0bd99dad: am dbff15a9: am ↵Baligh Uddin2013-10-030-0/+0
| |\ | | | | | | | | | | | | | | | af1ca413: am daad9c68: am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089 * commit 'd1fc691c3054548487da1fd1b3f3c8ed716cbdc2':
| | * am 94e383bb: am 276547da: am 0bd99dad: am dbff15a9: am af1ca413: am ↵Baligh Uddin2013-10-030-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | daad9c68: am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e4 * commit '94e383bb889e4d7da0afd66d435ad50fd3d9a028':
| | | * am 276547da: am 0bd99dad: am dbff15a9: am af1ca413: am daad9c68: am ↵Baligh Uddin2013-09-260-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 5bc76be0: am 15a357a3: am 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 co * commit '276547dab1f1be494b2ba4610ca55c9429be3a07':
* | | | | am 9c03682c: am 4412ab10: am ce982f9c: am 99b03df6: am 75939dc1: am ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32d5b4e3: am 29370f41: am 204243c3: am 071c3c6d: am e8374789: am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6 * commit '9c03682c2073ce4ecec4c158a97507a3a91479c1':
| * | | | am 4412ab10: am ce982f9c: am 99b03df6: am 75939dc1: am 32d5b4e3: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 29370f41: am 204243c3: am 071c3c6d: am e8374789: am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "F * commit '4412ab1035538281c680447c993adcd4780ecbbb':
| | * | | am ce982f9c: am 99b03df6: am 75939dc1: am 32d5b4e3: am 29370f41: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | 204243c3: am 071c3c6d: am e8374789: am 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 'ce982f9cc13347807fe5a8ca21dd8cf0c4a1ca26':
| | | * | am 99b03df6: am 75939dc1: am 32d5b4e3: am 29370f41: am 204243c3: am ↵Satoshi Kataoka2013-09-260-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 071c3c6d: am e8374789: am 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 '99b03df6a65a4386fefa7b456fbb8165fdf07425':
* | | | | | am b49683c3: am 8427fd62: am 524882ce: am ed4dc25a: am b9b47104: am ↵Tadashi G. Takaoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9716016: am 217fe877: am eeb0459e: am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91b * commit 'b49683c3008175ed96147097e30b1cdc10d62666':
| * | | | | am 8427fd62: am 524882ce: am ed4dc25a: am b9b47104: am e9716016: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 217fe877: am eeb0459e: am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up * commit '8427fd62bbae1ac82e3961afb9bc21f5f9f8c2d0':
| | * | | | am 524882ce: am ed4dc25a: am b9b47104: am e9716016: am 217fe877: am ↵Tadashi G. Takaoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eeb0459e: am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateExcep * commit '524882ced51babf928bea045cd6c752b9187b97f':
| | | * | | am ed4dc25a: am b9b47104: am e9716016: am 217fe877: am eeb0459e: am ↵Tadashi G. Takaoka2013-09-260-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException referenc * commit 'ed4dc25af71de55e36d61c5f9d90f12b79ccbdd9':
* | | | | | | am 96e3bdb8: am 3e8fbbee: am 3c70e928: am 85b8dc48: am 9faf3e64: am ↵The Android Open Source Project2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 461a0480: am be7561c2: am 41b61150: am adef73a7: am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 2 * commit '96e3bdb885c67c50a1e333c29dd8391eca92db67':
| * | | | | | am 3e8fbbee: am 3c70e928: am 85b8dc48: am 9faf3e64: am 461a0480: am ↵The Android Open Source Project2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be7561c2: am 41b61150: am adef73a7: am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s * commit '3e8fbbeeb04eac799c757e8e0a5716bc9fe84448':
| | * | | | | am 3c70e928: am 85b8dc48: am 9faf3e64: am 461a0480: am be7561c2: am ↵The Android Open Source Project2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41b61150: am adef73a7: am eb2fee1d: am 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 54f0 * commit '3c70e9287cf690930eea249f8de6cf2528889563':
| | | * | | | am 85b8dc48: am 9faf3e64: am 461a0480: am be7561c2: am 41b61150: am ↵The Android Open Source Project2013-09-260-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adef73a7: am eb2fee1d: am 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 a6fa * commit '85b8dc48ce78fa3cb98bddd8b759bb5b47f2215e':
* | | | | | | | am 2e2feec5: am 8b84296a: am 55cefbcc: am 791e3780: am 7ba85ad2: am ↵Alan Viverette2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74f99743: am 77deeefe: am 3694cc82: am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7f * commit '2e2feec56f67dd090df847e1fda0e7417250080e':
| * | | | | | | am 8b84296a: am 55cefbcc: am 791e3780: am 7ba85ad2: am 74f99743: am ↵Alan Viverette2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77deeefe: am 3694cc82: am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 55961 * commit '8b84296a52fb6e6c8fe5efc4a013c7eed3cc8ece':
| | * | | | | | am 55cefbcc: am 791e3780: am 7ba85ad2: am 74f99743: am 77deeefe: am ↵Alan Viverette2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3694cc82: am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent * commit '55cefbcc3d52973bdb601758a5eacbd626b11992':
| | | * | | | | am 791e3780: am 7ba85ad2: am 74f99743: am 77deeefe: am 3694cc82: am ↵Alan Viverette2013-09-260-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4f98a02: am 79ef0a17: am 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 * commit '791e37803d2c137d6f16f1d90fe71a8e094bb921':
* | | | | | | | | am 8cab4b32: am 0520a0fc: am 00ef2f30: am 1369200c: am baa4a50b: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97b579d5: am efd85328: (-s ours) am c825c557: am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b6 * commit '8cab4b32326c7fa85287fc2279273fd52316ff3d':
| * | | | | | | | am 0520a0fc: am 00ef2f30: am 1369200c: am baa4a50b: am 97b579d5: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efd85328: (-s ours) am c825c557: am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s our * commit '0520a0fc74ee331a61e728ea9720545410f2d487':
| | * | | | | | | am 00ef2f30: am 1369200c: am baa4a50b: am 97b579d5: am efd85328: (-s ours) ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c825c557: am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105 * commit '00ef2f30063775520ef5428a18c7972ae66cd843':
| | | * | | | | | am 1369200c: am baa4a50b: am 97b579d5: am efd85328: (-s ours) am c825c557: ↵Jean Chalard2013-09-260-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b2af86cf: (-s ours) am 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) * commit '1369200c1d1e22426c3d7958e7778d64857908f1':
* | | | | | | | | | am 685b075b: am c84db8d1: am ea465c05: am 24601d1e: am b12b3b07: am ↵Jean Chalard2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66833def: am dd0e671a: am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits" * commit '685b075bd5978983e48d3453f78a45e47012dc33':
| * | | | | | | | | am c84db8d1: am ea465c05: am 24601d1e: am b12b3b07: am 66833def: am ↵Jean Chalard2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd0e671a: am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits" * commit 'c84db8d1de610faf46803d2348955fa0e55abe3c':
| | * | | | | | | | am ea465c05: am 24601d1e: am b12b3b07: am 66833def: am dd0e671a: am ↵Jean Chalard2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits" * commit 'ea465c050f4269c99a226c4cfa8aac65f1931831':
| | | * | | | | | | am 24601d1e: am b12b3b07: am 66833def: am dd0e671a: am 30439651: am ↵Jean Chalard2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits" * commit '24601d1e62c3968c26b1b40d3b8bdc518f3ba746':
* | | | | | | | | | | am 60d58582: am d9f69ba3: am 26b6ed18: am 08413e8f: am 02b8fc7b: am ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7916a5d2: am 6da2f050: (-s ours) am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc80 * commit '60d5858218af36dc69a0e735d66fc86a60cecaae':
| * | | | | | | | | | am d9f69ba3: am 26b6ed18: am 08413e8f: am 02b8fc7b: am 7916a5d2: am ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6da2f050: (-s ours) am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s our * commit 'd9f69ba3519bc0fe340805fe88d497131fbd3aad':
| | * | | | | | | | | am 26b6ed18: am 08413e8f: am 02b8fc7b: am 7916a5d2: am 6da2f050: (-s ours) ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b * commit '26b6ed18782dae4971b1f09cb4920d26dde4ea5e':
| | | * | | | | | | | am 08413e8f: am 02b8fc7b: am 7916a5d2: am 6da2f050: (-s ours) am 79971a1f: ↵Baligh Uddin2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8a0205e2: (-s ours) am 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) * commit '08413e8f1e6914967a8b533aee2ea7b9b62d00b0':
* | | | | | | | | | | | am b54a9e60: am 97b6fda7: am 3cd58276: am e66c1e85: am e553f0e9: am ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a68cf1e: (-s ours) am 6686f6ee: (-s ours) am ea151032: am 4d085cfa: (-s ours) am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd * commit 'b54a9e60802f702d8104135be55a0b77cfc4b64c':
| * | | | | | | | | | | am 97b6fda7: am 3cd58276: am e66c1e85: am e553f0e9: am 7a68cf1e: (-s ours) ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6686f6ee: (-s ours) am ea151032: am 4d085cfa: (-s ours) am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085d * commit '97b6fda783ab3e17c2449c7bf14d1ee0435e5ace':
| | * | | | | | | | | | am 3cd58276: am e66c1e85: am e553f0e9: am 7a68cf1e: (-s ours) am 6686f6ee: ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am ea151032: am 4d085cfa: (-s 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) * commit '3cd5827602077abe1dbfc4fcfbc61bd5eca82433':
| | | * | | | | | | | | am e66c1e85: am e553f0e9: am 7a68cf1e: (-s ours) am 6686f6ee: (-s ours) am ↵Baligh Uddin2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea151032: am 4d085cfa: (-s 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 transl * commit 'e66c1e8504f9277a1f89d5e455670f8a13635ae0':
* | | | | | | | | | | | | am 2d8c4674: am 7eca3bd8: am 637ae0fc: am c3ed8ac5: am 582bbf20: (-s ours) ↵Baligh Uddin2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 39177323: (-s ours) am 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: * commit '2d8c46742cac8633bb9fdd60018e61cb30bd5381':
| * | | | | | | | | | | | am 7eca3bd8: am 637ae0fc: am c3ed8ac5: am 582bbf20: (-s ours) am 39177323: ↵Baligh Uddin2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: * commit '7eca3bd830743a1d029bad9cf762ad0810efb00b':
| | * | | | | | | | | | | am 637ae0fc: am c3ed8ac5: am 582bbf20: (-s ours) am 39177323: (-s ours) am ↵Baligh Uddin2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import transl * commit '637ae0fc8f436177b78f9e1e3e0384355639da45':
| | | * | | | | | | | | | am c3ed8ac5: am 582bbf20: (-s ours) am 39177323: (-s ours) am 4c2b9e46: (-s ↵Baligh Uddin2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NO * commit 'c3ed8ac566354d9d7d7ebbe6de8439d40cf4d8fd':
* | | | | | | | | | | | | | am 224892d8: am f97bffc5: am 949cbdc3: am 8f640acc: am 207ede4f: am ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8af0cc2e: am 9da909d1: am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit '224892d8ea4ff9aadb5c284509c925c7c20f5f3c':
| * | | | | | | | | | | | | am f97bffc5: am 949cbdc3: am 8f640acc: am 207ede4f: am 8af0cc2e: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9da909d1: am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit 'f97bffc54a34710f1f9cdc796fcdd22ccc309818':
| | * | | | | | | | | | | | am 949cbdc3: am 8f640acc: am 207ede4f: am 8af0cc2e: am 9da909d1: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit '949cbdc35049cd6bf46640b4784eb983b37ed948':
| | | * | | | | | | | | | | am 8f640acc: am 207ede4f: am 8af0cc2e: am 9da909d1: am dcfff5c0: am ↵Satoshi Kataoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit '8f640acc9a6feaec7a7494c365fd201c22014662':
* | | | | | | | | | | | | | | am 60317428: am 9b5ffeed: am b4fb8291: am 6581aad7: am d0776552: am ↵Satoshi Kataoka2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 795895e1: am f368fdb6: am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit '60317428020fe713eeb2a8a6ab4f98a1b2138030':
| * | | | | | | | | | | | | | am 9b5ffeed: am b4fb8291: am 6581aad7: am d0776552: am 795895e1: am ↵Satoshi Kataoka2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f368fdb6: am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit '9b5ffeed7337269b4f54bd52782c5f7b855b26b5':
| | * | | | | | | | | | | | | am b4fb8291: am 6581aad7: am d0776552: am 795895e1: am f368fdb6: am ↵Satoshi Kataoka2013-10-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit 'b4fb829138bce995118f964231aa466a925224e4':
| | | * | | | | | | | | | | | am 6581aad7: am d0776552: am 795895e1: am f368fdb6: am 3d82dbca: am ↵Satoshi Kataoka2013-09-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit '6581aad72d1e68b8c3ef1418b2662458217e90fb':
* | | | | | | | | | | | | | | | am 7bac0700: am c1576be9: am d2b1da1c: am a1c6ad87: am 1e5d5eac: am ↵Kurt Partridge2013-10-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d4cb019: am c68eb70a: am 023bee60: am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon o * commit '7bac07002acb2d8a72036b4e0b7c0d8b4143b170':
| * | | | | | | | | | | | | | | am c1576be9: am d2b1da1c: am a1c6ad87: am 1e5d5eac: am 4d4cb019: am ↵Kurt Partridge2013-10-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c68eb70a: am 023bee60: am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputV * commit 'c1576be911b031ce9e16fc637442400920af6dae':