aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-1539-149/+784
| | |\
| | | * Import translations. DO NOT MERGEGeoff Mendal2015-07-1539-149/+784
| | | | | | | | | | | | | | | | | | | | Change-Id: Iebd6e5f51a121cae7913e6ac21c4140b9c4de6f9 Auto-generated-cl: translation import
* | | | am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'f72e120216d591f6ed1a9aa69d34009d69848108': Import translations. DO NOT MERGE
| * | | am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '6aea6b9da7b779ff5f08da631f30bc5f177a3423': Import translations. DO NOT MERGE
| | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-159-8/+278
| | |\ \
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-159-8/+278
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I922b3fb60a57db87c8bf1da3d3cd7fa976d9f5f9 Auto-generated-cl: translation import
* | | | am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'a6d8425760ff3e10f3351545ac7e01e8626fdd8c': Import translations. DO NOT MERGE
| * | | am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434': Import translations. DO NOT MERGE
| | * | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-156-32/+864
| | |\ \
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-32/+864
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I1ce33d32d058d27eae565c1e982b491372878d25 Auto-generated-cl: translation import
* | | | am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit 'd6cba73e4c0ec4c4f2f47957873f0983620ff9c4': Import translations. DO NOT MERGE
| * | | am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'c8e261e95bd78ab2a3926d030c0525eba0fd8ca7': Import translations. DO NOT MERGE
| | * | 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 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 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 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 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
* | | DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60feQiwen Zhao2015-07-130-0/+0
|\ \ \ | |/ / |/| |
| * | 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 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 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 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 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 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 8c2591ee: Bring back shortcuts and add to dictionary UIJatin Matani2015-07-117-62/+466
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '8c2591eec80dbe44158b1613cd96056057a41139': Bring back shortcuts and add to dictionary UI
* | | | | keep history after reset to ub-latinimegoogle-fava-releaseJatin Matani2015-07-100-0/+0
|\| | | | | |_|_|/ |/| | | | | | | This build IS suitable for public release
| * | | Revert reset to ub-latinimegoogle-fava-releaseBaligh Uddin2015-07-010-0/+0
| |\ \ \
| | * \ \ keep history after reset to ub-latinimegoogle-fava-releaseBaligh Uddin2015-07-010-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-312-9/+9
| |\ \ \ \