aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 2bc2b351: (-s ours) am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset ↵Qiwen Zhao2015-07-150-0/+0
|\ | | | | | | | | | | to mnc-dev at 9cd60fe * commit '2bc2b351ebf504c76be64658a5cf89a9c34046ce':
| * 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
| | |\
* | | | am 1d1441d3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-150-0/+0
|\| | | | | | | | | | | | | | | * commit '1d1441d32a9b79a114c5d5c8252f3caaf96f81f2':
| * | | 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 1e14b459: 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 '1e14b4597feda704782ec8f5b7783c66aabdaa94':
| | * | 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 741b6acb: am c8edecc5: am 32afc638: Merge "resolved conflicts for merge ↵Qiwen Zhao2015-07-133-3/+78
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of d711426a to mnc-dr-dev" into mnc-dr-dev * commit '741b6acbf88e0a08703fdab295fc2697adf6c1c6': Remove android.util.Log from FileUtils
| | * | | | 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 2676508c: (-s ours) am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '2676508c490833104929db90c4d82177dd38ab0e': Import translations. DO NOT MERGE
| | * | | | | | 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 1bea2964: (-s ours) am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '1bea2964fa709a5c06a5d4bf004c16425f87bc51': Import translations. DO NOT MERGE
| | * | | | | | 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 5b704f84: (-s ours) am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '5b704f8457ac4ca5b2ca6b0e8372ab88e51d83c1': Import translations. DO NOT MERGE
| | * | | | | | 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 9fe77811: (-s ours) am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '9fe7781171024a5046374d9c62d7c5affa049dc0': Import translations. DO NOT MERGE
| | * | | | | | 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 c3f9f1d5: am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to ↵Jatin Matani2015-07-137-62/+466
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary UI * commit 'c3f9f1d50b0e03deb78eff17d0ec2ffd522b792c': Bring back shortcuts and add to dictionary UI
| | * | | | 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 91886a31: am baec6ce1: Revert reset to ub-latinimegoogle-fava-releaseBaligh Uddin2015-07-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91886a31fbafea33a4e94722a0f271639de4eb4b': (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 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 698cce6e: (-s ours) am da855ea1: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-06-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '698cce6e98a9381ab23bd314943880e335af07f2': 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 f527654c: (-s ours) am e7622f9d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f527654c9895f30b8fd74c3c81bb0d5121645c9c': 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
| * | | | | | | | am 401b9e8e: (-s ours) am 1f428ace: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-06-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '401b9e8e67d15f08adb31b41f71b7ba7b6458ee2': Import translations. DO NOT MERGE
| | * | | | | | | am 1f428ace: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-110-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f428ace1b1e667dc1528543324048afaf918ed4': Import translations. DO NOT MERGE
| * | | | | | | | | am ec58d6b6: (-s ours) am 966fd1b2: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-06-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'ec58d6b6f8404314824c6623fd89d8546512b111': Import translations. DO NOT MERGE
| | * | | | | | | | am 966fd1b2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-110-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '966fd1b2d825df4c1ba4c88a45934067ea56ae08': Import translations. DO NOT MERGE
| * | | | | | | | | | am 3701ce75: (-s ours) am 79c48938: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-06-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '3701ce750e769c3b92527683c17954b83518460d': Import translations. DO NOT MERGE
| | * | | | | | | | | am 79c48938: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-110-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '79c489389a53c1bc358bac994bc52b1ee99b85e4': Import translations. DO NOT MERGE
| * | | | | | | | | | | am c584739f: (-s ours) am 275211f5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-06-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c584739fb5743faf78e6c4f21cbbcb4dfff4fb2e': Import translations. DO NOT MERGE