aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-156-2/+98
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGE•••Change-Id: I52fbd93b2ddb4f78926ecd7db84c8506dff48b28 Auto-generated-cl: translation import Geoff Mendal2015-07-156-2/+98
| |/ / / / / /
* | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-156-3/+111
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGE•••Change-Id: I77f00be6e8d3b966f60fef0c66a6e98c44180d19 Auto-generated-cl: translation import Geoff Mendal2015-07-156-3/+111
| |/ / / / / /
* / / / / / / Import translations. DO NOT MERGE•••Change-Id: If3d7ed1987e024974263084f4233b8b549f09381 Auto-generated-cl: translation import Geoff Mendal2015-07-156-2/+126
|/ / / / / /
* | | | | | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-130-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | am b6679556: am 1e14b459: am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-...•••* commit 'b66795562b56a4adc942f94e13e164d7a13a8b1e': The Android Automerger2015-07-130-0/+0
| |\| | | |
| | * | | | am 1e14b459: am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-latinimegoogl...•••* commit '1e14b4597feda704782ec8f5b7783c66aabdaa94': The Android Automerger2015-07-130-0/+0
| | |\| | |
| | | * | | am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-releas...•••* commit '98aaffaafe9246f7e3b2aff4ff605b5fbbed9f69': The Android Automerger2015-07-130-0/+0
| | | |\| |
| | | | * | am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history aft...•••* commit 'b4b19735182767df88f3a196a94c4a943423e72b': The Android Automerger2015-07-130-0/+0
| | | | |\|
| | | | | * am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to j...•••* commit '01f042ccfa4530e7be2c01dbda5ed4a296ba535e': The Android Automerger2015-07-130-0/+0
| | | | | |\
| * | | | | | am 0564deb1: (-s ours) am 741b6acb: am c8edecc5: am 32afc638: Merge "resolved...•••* commit '0564deb185675b53081befffe48ccac9a0b4dcca': Remove android.util.Log from FileUtils Qiwen Zhao2015-07-130-0/+0
| |\| | | | |
| | * | | | | am 741b6acb: am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of...•••* commit '741b6acbf88e0a08703fdab295fc2697adf6c1c6': Remove android.util.Log from FileUtils Qiwen Zhao2015-07-133-3/+78
| | |\| | | |
| | | * | | | am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to ...•••* commit 'c8edecc5432d8b1d7c487d7a6f3bc6339358afaa': Remove android.util.Log from FileUtils Qiwen Zhao2015-07-133-3/+78
| | | |\| | |
| | | | * | | am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" i...•••* commit '32afc638e9aed9a80cd25d0884406b7394a6ac60': Remove android.util.Log from FileUtils Qiwen Zhao2015-07-133-3/+78
| | | | |\| |
| | | | | * | 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-dev•••Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d Jatin Matani2015-07-133-3/+78
| | | | | | |\ \
| * | | | | | | | am 87c8e92d: (-s ours) am 2676508c: (-s ours) am 4203b5d8: (-s ours) am 85a15...•••* commit '87c8e92deaad8f10304f801224a6f9fe4400e879': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| |\| | | | | | |
| | * | | | | | | am 2676508c: (-s ours) am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "I...•••* commit '2676508c490833104929db90c4d82177dd38ab0e': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | |\| | | | | |
| | | * | | | | | am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO ...•••* commit '4203b5d8d84592d78dd05db7ab0d8fb9845a3e4e': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | | |\| | | | |
| | | | * | | | | am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev•••* commit '85a156223ceee5340ca7b6c31854d2e7ec38e0ff': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | | | |\| | | |
| | | | | * | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-1144-336/+335
| | | | | |\ \ \ \
| | | | | | * | | | Import translations. DO NOT MERGE•••Change-Id: Idbbfc3e5aa4f2f55e848e117da6f6b553323b971 Auto-generated-cl: translation import Geoff Mendal2015-07-1144-336/+335
| | | | | | |/ / /
| * | | | | | | | am 2e3d5f56: (-s ours) am 1bea2964: (-s ours) am 7bceb2e3: (-s ours) am 0975c...•••* commit '2e3d5f561fed0874f5260b467af20fc04edf85a7': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| |\| | | | | | |
| | * | | | | | | am 1bea2964: (-s ours) am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "I...•••* commit '1bea2964fa709a5c06a5d4bf004c16425f87bc51': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | |\| | | | | |
| | | * | | | | | am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO ...•••* commit '7bceb2e3791a2c4d010fd770eceef203099f2a11': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | | |\| | | | |
| | | | * | | | | am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev•••* commit '0975cce068471874de7004b1bfb73f76b06bbe05': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | | | |\| | | |
| | | | | * | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-114-4/+4
| | | | | |\ \ \ \
| | | | | | * | | | Import translations. DO NOT MERGE•••Change-Id: I8686627b551188696543ab94fff742a02e6e27cc Auto-generated-cl: translation import Geoff Mendal2015-07-114-4/+4
| | | | | | |/ / /
| * | | | | | | | am 718b0b16: (-s ours) am 5b704f84: (-s ours) am d28a54a8: (-s ours) am b2fe5...•••* commit '718b0b16e5d7f438c0fbfd08c8beab33c4d806fa': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| |\| | | | | | |
| | * | | | | | | am 5b704f84: (-s ours) am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "I...•••* commit '5b704f8457ac4ca5b2ca6b0e8372ab88e51d83c1': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | |\| | | | | |
| | | * | | | | | am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO ...•••* commit 'd28a54a8315d10c78c4c40bfdd8ce5ce8be10fb9': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | | |\| | | | |
| | | | * | | | | am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev•••* commit 'b2fe54720bcf1d233f837e8528c344f6375177ee': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | | | |\| | | |
| | | | | * | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-112-2/+2
| | | | | |\ \ \ \
| | | | | | * | | | Import translations. DO NOT MERGE•••Change-Id: Iaee7e2521801ec3fd3b7856b6aded0d0980f4ea7 Auto-generated-cl: translation import Geoff Mendal2015-07-112-2/+2
| | | | | | |/ / /
| * | | | | | | | am 475a4a0a: (-s ours) am 9fe77811: (-s ours) am 83c781e4: (-s ours) am 98c4e...•••* commit '475a4a0a00642433d552ef3273202804d1baeec5': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| |\| | | | | | |
| | * | | | | | | am 9fe77811: (-s ours) am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import t...•••* commit '9fe7781171024a5046374d9c62d7c5affa049dc0': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | |\| | | | | |
| | | * | | | | | am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGE•••* commit '83c781e46c3d3d186595ef0c31a3d544edfcf62a': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | | |\| | | | |
| | | | * | | | | am 98c4eba2: (-s ours) Import translations. DO NOT MERGE•••* commit '98c4eba2cea310863f551af07a9c122e50ef425d': Import translations. DO NOT MERGE Geoff Mendal2015-07-130-0/+0
| | | | |\| | | | | | | | | |/ / / | | | | |/| | |
| | | | | * | | Import translations. DO NOT MERGE•••Change-Id: I144d565ab22039cb3af19760ae2fde169729cfe5 Auto-generated-cl: translation import Geoff Mendal2015-07-112-3/+3
| | | | |/ / /
| * | | | | | am 9e87bcea: am c3f9f1d5: am 4d7a7780: am 8c2591ee: Bring back shortcuts and ...•••* commit '9e87bcea51de1c2a27a22ce7180290e27cf033c0': Bring back shortcuts and add to dictionary UI Jatin Matani2015-07-137-62/+466
| |\| | | | |
| | * | | | | am c3f9f1d5: am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictio...•••* commit 'c3f9f1d50b0e03deb78eff17d0ec2ffd522b792c': Bring back shortcuts and add to dictionary UI Jatin Matani2015-07-137-62/+466
| | |\| | | |
| | | * | | | am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictionary UI•••* commit '4d7a7780395a2376b566452646d1a241e165c3bf': Bring back shortcuts and add to dictionary UI Jatin Matani2015-07-137-62/+466
| | | |\| | |
| | | | * | | am 8c2591ee: Bring back shortcuts and add to dictionary UI•••* commit '8c2591eec80dbe44158b1613cd96056057a41139': Bring back shortcuts and add to dictionary UI Jatin Matani2015-07-117-62/+466
| | | | |\ \ \
| * | | | | | | Import translations. DO NOT MERGE•••Change-Id: I566767b9e742ccae64b0935b80b8baba90bb247b Auto-generated-cl: translation import Geoff Mendal2015-07-112-7/+7
| * | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-0819-85/+84
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGE•••Change-Id: Ib173a3361b770200c40bf2db4dcd52a8beb54e50 Auto-generated-cl: translation import Geoff Mendal2015-07-0819-85/+84
| * | | | | | | | Import translations. DO NOT MERGE•••Change-Id: I9248fb41219930b51fdda827ee9a7c03a8bb6965 Auto-generated-cl: translation import Geoff Mendal2015-07-081-1/+1
| |/ / / / / / /
| * | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-0620-72/+72
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGE•••Change-Id: I9a25a4fd8071b08dc2c12053c8df5c925cb6c493 Auto-generated-cl: translation import Geoff Mendal2015-07-0620-72/+72