aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 849c7858: am eff2ee76: am 45b1a302: am 80a2e251: am 14f65cff: am ↵Alan Viverette2013-04-170-0/+0
|\ | | | | | | | | | | 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode. * commit '849c785807ba536c6a26fbadc7f153f1747d76bc':
| * am eff2ee76: am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am ↵Alan Viverette2013-04-100-0/+0
| |\ | | | | | | | | | | | | | | | f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode. * commit 'eff2ee76d858f7637bd0e11a8cf92000568f0191':
| | * am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am f518e71a: am ↵Alan Viverette2013-04-100-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode. * commit '45b1a302cff21869db19c26b4b82919b279beeef':
* | | | am cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname" * commit 'cb132ce11df59be842f16ec69be16bd6316e234f':
| * | | am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname" * commit '81295fd2b211b67d842a6994b2d37c1c7952de6c':
| | * | am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname" * commit '119e6979846f7cd41f98f1feea7a5959e8c91314':
* | | | | am 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import * commit '3a2e78f9b5b585b85a12283ed89bcec3376fdc32':
| * | | | am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import * commit '30d9817bd00b924c3f5db091773b8d84523f8dc5':
| | * | | am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import * commit '7dcc22b66bc1b1e5d90d6d61ac20f0df4909fb9f':
* | | | | | am 96d53923: am 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" * commit '96d539237f22dd9d29a41bbdefd16978a148b442':
| * | | | | am 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" * commit '104923e4716aef2bef6db14dceb8063cb1af2438':
| | * | | | am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" * commit '863d83ea27af1957a10fca4b42051a9fce399f10':
* | | | | | | am 54f46879: am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource" * commit '54f46879de606cb913888ddc419742c7a61d2108':
| * | | | | | am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource" * commit '1af04dc698e2352eb3fedd13369fd88e50936e2f':
| | * | | | | am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource" * commit '249ad4d57ca477eb7a1ba28d6b0e5a505afa9a97':
* | | | | | | | am 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev * commit '2060aa13e5f946950f788c383e5655c36167d062':
| * | | | | | | am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am ↵Baligh Uddin2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev * commit '97046d19844bc22414c510a1dac384eee27d924c':
| | * | | | | | am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am ↵Baligh Uddin2013-04-100-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev * commit '1d024eca3f1d055da2977ad0725da203b8035c2e':
* | | | | | | | | am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname" * commit '9e45f9e85807591b6484b4d96d5c6607d67bd755':
| * | | | | | | | am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname" * commit '24cf39e787858900988ca9697d6212cd62ef85a1':
| | * | | | | | | am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname" * commit '894a8ffcfd76456da3390cd4d3348f0371801669':
* | | | | | | | | | am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am ↵Tadashi G. Takaoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder * commit '7bc7bd79974bfccb437abc6cd4bab85d1aeb931b':
| * | | | | | | | | am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder * commit '59b23bcfae2993a394045f12f17f5a4cbebc9f8c':
| | * | | | | | | | am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am ↵Tadashi G. Takaoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder * commit '680d689d859041a666a43a877da79161847f4535':
* | | | | | | | | | | am 7db5bfa0: am 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: ↵The Android Open Source Project2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-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 with jb-mr2-release - do not merge * commit '7db5bfa0faf93f63dfc7e77c343799d07d886031':
| * | | | | | | | | | am 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am ↵The Android Open Source Project2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '20995333067181fe68f5d325ca067d142d35a08e':
| | * | | | | | | | | am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: ↵The Android Open Source Project2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '5d674b166d151813718e6bf591573947eb3cae9a':
* | | | | | | | | | | | am 4b45830a: am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am ↵Alan Viverette2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. * commit '4b45830a210b2eb61ebb3207234c9d848cb5b38b':
| * | | | | | | | | | | am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am ↵Alan Viverette2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. * commit '7c9b7f249e48bbe130afdbceb9a501c704e6c74b':
| | * | | | | | | | | | am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am ↵Alan Viverette2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. * commit 'e592be58095180558f18a36f7f42527a0af0e38a':
* | | | | | | | | | | | | am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev * commit '186cf922f0176078d49c8855256bc6b10be0a383':
| * | | | | | | | | | | | am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev * commit '288deb7ab980dc37892b451206b653cbc24b2814':
| | * | | | | | | | | | | am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev * commit '11034c340a0b5fc294b69bb1c37e159255dd6ba5':
* | | | | | | | | | | | | | am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am ↵Jean Chalard2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits" * commit '2cef432317c17c9382cd6f90812affb6283c8827':
| * | | | | | | | | | | | | am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am ↵Jean Chalard2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e78878f: am 844e5014: Merge "Increase string limits" * commit 'db3713a1b9e9b144ddb728bab0a1d4babd7b924a':
| | * | | | | | | | | | | | am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am ↵Jean Chalard2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 844e5014: Merge "Increase string limits" * commit '9f9050d18fc3708badc6f906744d500458c70d36':
* | | | | | | | | | | | | | | am e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE * commit 'e04cee4fe60626f2f0942c3e8892159629f3a845':
| * | | | | | | | | | | | | | am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am ↵Baligh Uddin2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE * commit '492016265c8d4eeff78656d57fa8b8cf5a43709e':
| | * | | | | | | | | | | | | am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: ↵Baligh Uddin2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE * commit '0b758ec77fc14f768ddea0693e5d412086a591ef':
* | | | | | | | | | | | | | | | am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE * commit '3df28d1495fdd3eaa90ac5a41624e112b5bd8a1a':
| * | | | | | | | | | | | | | | am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am ↵Baligh Uddin2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE * commit '14d778b27c79cc027ccc451514db9e2bd6ef9ab7':
| | * | | | | | | | | | | | | | am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: ↵Baligh Uddin2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8ca085db: (-s ours) Import translations. DO NOT MERGE * commit '3847aa30ae68a7e94daa484643ea68f16860d062':
* | | | | | | | | | | | | | | | | am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: ↵Baligh Uddin2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE * commit '719e57293d00cbe407c8953b40b2a17fe26e6a3a':
| * | | | | | | | | | | | | | | | am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am ↵Baligh Uddin2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b227bb9: am 57b68207: Import translations. DO NOT MERGE * commit 'e71516b290fb137d6b926df23fcc383866bdf069':
| | * | | | | | | | | | | | | | | am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: ↵Baligh Uddin2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE * commit '5244d6378ce3df391ea855e8dbc87e5e648ea042':
* | | | | | | | | | | | | | | | | | am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit '5db288268b70ca0eb4e6faa67bfe5671530892d6':
| * | | | | | | | | | | | | | | | | am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb9a8e08: am f463b45d: Merge "Fix Possible NPE" * commit 'b3796ab2a7c66e8bcd6911bb1dc0fa8982f16d0a':
| | * | | | | | | | | | | | | | | | am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am ↵Satoshi Kataoka2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f463b45d: Merge "Fix Possible NPE" * commit '82a67bc8bbef7b9553d128f01e0813e63a3ac0ba':
* | | | | | | | | | | | | | | | | | | am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am ↵Satoshi Kataoka2013-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit '71f828b12aa1fca16e8824c5ea44f61ebbc7f7d9':
| * | | | | | | | | | | | | | | | | | am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am ↵Satoshi Kataoka2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" * commit '9ff33b6dfa6641a5fe064624e07182db042df92f':