aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8e3fa5c1: (-s ours) am 16b9a0ba: (-s ours) am 247aef75: (-s ours) am ↵Qiwen Zhao2015-07-150-0/+0
|\ | | | | | | | | | | 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe. * commit '8e3fa5c1c400e4ae239fa00c68b7753321965013':
| * am 16b9a0ba: (-s ours) am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT ↵Qiwen Zhao2015-07-150-0/+0
| |\ | | | | | | | | | | | | | | | MERGE ANYWHERE. reset to mnc-dev at 9cd60fe. * commit '16b9a0ba09380f2c176068005cb28eb1e1d5dbac':
| | * 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 ee6c7c0a: (-s ours) am 2bc2b351: (-s ours) am e8622174: (-s ours) DO NOT ↵Qiwen Zhao2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE ANYWHERE. reset to mnc-dev at 9cd60fe * commit 'ee6c7c0a141435a8322910c23f0eccecfe3aaa1d':
| * | | | | 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 3a9714ed: (-s ours) am 1d1441d3: (-s ours) DO NOT MERGE ANYWHERE. reset ↵Qiwen Zhao2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to mnc-dev at 9cd60fe * commit '3a9714ed31096cb65fd8c1c9867a3b3ef3f71ee5':
| * | | | | 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
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | am 0a0acc3b: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0a0acc3b8d8167c2ebedb8f26379a6ee90a2fe0b':
| * | | | | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-130-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-1539-149/+784
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1539-149/+784
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I902a7ba3ad4374dae7af5a86fae37c7fbb9f611f Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-159-8/+278
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-159-8/+278
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb224238f36380adb49ea9ba2059a44e0bd6a004 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-156-32/+864
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-32/+864
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I824270b06a5f72038f98c7259107e4984bce25b8 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-1512-46/+3450
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1512-46/+3450
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bd02d5316ff4c15a713bd79345382ae79f2e4d8 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-156-2/+98
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-2/+98
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I52fbd93b2ddb4f78926ecd7db84c8506dff48b28 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-07-156-3/+111
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-3/+111
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77f00be6e8d3b966f60fef0c66a6e98c44180d19 Auto-generated-cl: translation import
* / / / / / / Import translations. DO NOT MERGEGeoff Mendal2015-07-156-2/+126
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3d7ed1987e024974263084f4233b8b549f09381 Auto-generated-cl: translation import
* | | | | | 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 ↵The Android Automerger2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle * commit 'b66795562b56a4adc942f94e13e164d7a13a8b1e':
| | * | | | 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 0564deb1: (-s ours) am 741b6acb: am c8edecc5: am 32afc638: Merge ↵Qiwen Zhao2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev * commit '0564deb185675b53081befffe48ccac9a0b4dcca': Remove android.util.Log from FileUtils
| | * | | | | 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 87c8e92d: (-s ours) am 2676508c: (-s ours) am 4203b5d8: (-s ours) am ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '87c8e92deaad8f10304f801224a6f9fe4400e879': Import translations. DO NOT MERGE
| | * | | | | | | 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 2e3d5f56: (-s ours) am 1bea2964: (-s ours) am 7bceb2e3: (-s ours) am ↵Geoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '2e3d5f561fed0874f5260b467af20fc04edf85a7': Import translations. DO NOT MERGE
| | * | | | | | | 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
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-01 23:11:09 +0000