aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-1512-46/+3450
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-1512-46/+3450
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Id1d45fb3ba0b84c8574bd8e326c62f2417660ce3 Auto-generated-cl: translation import
* | | | | am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'b8d881f2505be5511f21ec2de86bc3e8523c3643': Import translations. DO NOT MERGE
| * | | | am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'cce9728e2b838642c85e30978854793b481954d2': Import translations. DO NOT MERGE
| | * | | am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'cf849b40df13546046d3d7c89dc63c3e8b354976': Import translations. DO NOT MERGE
| | | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-156-2/+98
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-2/+98
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Id4a9a90498ece00ba399074bef4010ecd315aeb7 Auto-generated-cl: translation import
* | | | | am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit '63917040f1143c036ff480cee3e26790eaddb263': Import translations. DO NOT MERGE
| * | | | am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '74d4fdc31c8b3893c498c26e833eabe86f03fb57': Import translations. DO NOT MERGE
| | * | | am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '29217bcd651d1ab968d01744533aec009fe252da': Import translations. DO NOT MERGE
| | | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-156-3/+111
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-3/+111
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: I41b452436ee558b42b104387eb3431d8164ab766 Auto-generated-cl: translation import
* | | | | am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'cc34158af0bf5318a33d74fed3e01de32a62149a': Import translations. DO NOT MERGE
| * | | | am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '16ad0293117e18b90d4140a4e3241cd84a1f28a9': Import translations. DO NOT MERGE
| | * | | am 285c9d82: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '285c9d825d53a76548079ad527c4c79fda69ada1': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-2/+126
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I7b33db63242fec09f647c250e66f9eef75c7b6fa Auto-generated-cl: translation import
* | | | am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset ↵Qiwen Zhao2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | to mnc-dev at 9cd60fe. * commit '247aef7564be66179a988e74bd695c324e36f6dd':
| * | | am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.Qiwen Zhao2015-07-150-0/+0
| |\| | | | | | | | | | | | | | * commit '490701a3feb84f73e5af9a2c4740f4d4be8455b7':
| | * | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.Qiwen Zhao2015-07-130-0/+0
| | |\ \ | | | |/ | | |/|
| | | * resolved conflicts for merge of 9cd60fe1 to mnc-dr-devJatin Matani2015-07-13144-5910/+761
| | | |\ | | | |/ | | |/| | | | | Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
* | | | am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-150-0/+0
|\| | | | | | | | | | | | | | | * commit 'e862217461bdf0d460b71d80b800a86be1eb61fc':
| * | | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-130-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-130-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | am 98aaffaa: am b4b19735: am 01f042cc: merge in ↵The Android Automerger2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle * commit '98aaffaafe9246f7e3b2aff4ff605b5fbbed9f69':
| | * | am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history ↵The Android Automerger2015-07-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | after reset to jb-ub-latinimegoogle * commit 'b4b19735182767df88f3a196a94c4a943423e72b':
| | | * am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to ↵The Android Automerger2015-07-130-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-latinimegoogle * commit '01f042ccfa4530e7be2c01dbda5ed4a296ba535e':
| * | | | am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to ↵Qiwen Zhao2015-07-133-3/+78
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev" into mnc-dr-dev * commit 'c8edecc5432d8b1d7c487d7a6f3bc6339358afaa': Remove android.util.Log from FileUtils
| | * | | am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" ↵Qiwen Zhao2015-07-133-3/+78
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit '32afc638e9aed9a80cd25d0884406b7394a6ac60': Remove android.util.Log from FileUtils
| | | * | Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-devQiwen Zhao2015-07-133-3/+78
| | | |\ \
| | | | * \ resolved conflicts for merge of d711426a to mnc-dr-devJatin Matani2015-07-133-3/+78
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d
| * | | | | | am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dr-dev * commit '4203b5d8d84592d78dd05db7ab0d8fb9845a3e4e': Import translations. DO NOT MERGE
| | * | | | | am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85a156223ceee5340ca7b6c31854d2e7ec38e0ff': Import translations. DO NOT MERGE
| | | * | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-1144-336/+335
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1144-336/+335
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbbfc3e5aa4f2f55e848e117da6f6b553323b971 Auto-generated-cl: translation import
| * | | | | | am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dr-dev * commit '7bceb2e3791a2c4d010fd770eceef203099f2a11': Import translations. DO NOT MERGE
| | * | | | | am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0975cce068471874de7004b1bfb73f76b06bbe05': Import translations. DO NOT MERGE
| | | * | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-114-4/+4
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-114-4/+4
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8686627b551188696543ab94fff742a02e6e27cc Auto-generated-cl: translation import
| * | | | | | am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dr-dev * commit 'd28a54a8315d10c78c4c40bfdd8ce5ce8be10fb9': Import translations. DO NOT MERGE
| | * | | | | am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2fe54720bcf1d233f837e8528c344f6375177ee': Import translations. DO NOT MERGE
| | | * | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-112-2/+2
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-112-2/+2
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaee7e2521801ec3fd3b7856b6aded0d0980f4ea7 Auto-generated-cl: translation import
| * | | | | | am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '83c781e46c3d3d186595ef0c31a3d544edfcf62a': Import translations. DO NOT MERGE
| | * | | | | am 98c4eba2: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\| | | | | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '98c4eba2cea310863f551af07a9c122e50ef425d': Import translations. DO NOT MERGE
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-112-3/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I144d565ab22039cb3af19760ae2fde169729cfe5 Auto-generated-cl: translation import
| * | | | am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictionary UIJatin Matani2015-07-137-62/+466
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '4d7a7780395a2376b566452646d1a241e165c3bf': Bring back shortcuts and add to dictionary UI
| | * | | am 8c2591ee: Bring back shortcuts and add to dictionary UIJatin Matani2015-07-117-62/+466
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c2591eec80dbe44158b1613cd96056057a41139': Bring back shortcuts and add to dictionary UI
| * | | | | am baec6ce1: Revert reset to ub-latinimegoogle-fava-releaseBaligh Uddin2015-07-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'baec6ce1abec381f5e2e69c032ca0cd460592266': (252 commits) Don't prompt before downloading. Add some more logging. Why not. Load metadata.json from resources on DB reset. Small optimization to eliminate a >0 check in RichInputConnection. Extend laggy connection timeout for initial load. Fix breakage in tests. LatinIME portion of StatsUtil change. Workaround for preserving responsiveness on a slow InputConnection. Do not decorate committed spans. Do not force downloads on package replace. Fix the previous downloads logic to not missing any downloads. Detection and logging of slow input connections. Clear/remove all the scheduled downloads in Download Manager Disable download notifications. Cleanup before fixing getTextAfterCursor(). Do not restrict downloads to WiFi networks. Import translations. DO NOT MERGE Revert "Remove "Personal dictionary" link from settings." Import translations. DO NOT MERGE Import translations. DO NOT MERGE ...
| * | | | | am da855ea1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-110-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da855ea1fdaca0674d9c9ccb11145bcb91e5ff5e': Import translations. DO NOT MERGE
| * \ \ \ \ \ am e7622f9d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-110-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e7622f9db830f0b91584f2a12d25111f0ea518a9': Import translations. DO NOT MERGE