Geoff Mendal
|
417f375851
|
am c73fabf6: (-s ours) am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c73fabf6080518732c6662df8d227c23847d9831':
Import translations. DO NOT MERGE
|
2015-07-15 17:37:10 +00:00 |
|
Geoff Mendal
|
cf090fc76e
|
am 68c112b6: (-s ours) am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '68c112b652194d97dd2b5c488cd2bd118758a0dd':
Import translations. DO NOT MERGE
|
2015-07-15 17:37:08 +00:00 |
|
Geoff Mendal
|
a7effd1d40
|
am 983dcbd1: (-s ours) am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '983dcbd1f858f9bbb5a9781bc9780ece834d70e3':
Import translations. DO NOT MERGE
|
2015-07-15 17:37:07 +00:00 |
|
Qiwen Zhao
|
8e3fa5c1c4
|
am 16b9a0ba: (-s ours) am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '16b9a0ba09380f2c176068005cb28eb1e1d5dbac':
|
2015-07-15 17:37:05 +00:00 |
|
Qiwen Zhao
|
ee6c7c0a14
|
am 2bc2b351: (-s ours) am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit '2bc2b351ebf504c76be64658a5cf89a9c34046ce':
|
2015-07-15 17:37:02 +00:00 |
|
Qiwen Zhao
|
3a9714ed31
|
am 1d1441d3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit '1d1441d32a9b79a114c5d5c8252f3caaf96f81f2':
|
2015-07-15 17:37:00 +00:00 |
|
Geoff Mendal
|
c73fabf608
|
am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b8d881f2505be5511f21ec2de86bc3e8523c3643':
Import translations. DO NOT MERGE
|
2015-07-15 17:17:33 +00:00 |
|
Geoff Mendal
|
68c112b652
|
am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '63917040f1143c036ff480cee3e26790eaddb263':
Import translations. DO NOT MERGE
|
2015-07-15 17:17:31 +00:00 |
|
Geoff Mendal
|
983dcbd1f8
|
am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit 'cc34158af0bf5318a33d74fed3e01de32a62149a':
Import translations. DO NOT MERGE
|
2015-07-15 17:17:29 +00:00 |
|
Qiwen Zhao
|
16b9a0ba09
|
am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '247aef7564be66179a988e74bd695c324e36f6dd':
|
2015-07-15 17:17:27 +00:00 |
|
Qiwen Zhao
|
2bc2b351eb
|
am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit 'e862217461bdf0d460b71d80b800a86be1eb61fc':
|
2015-07-15 17:17:27 +00:00 |
|
Geoff Mendal
|
b8d881f250
|
am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cce9728e2b838642c85e30978854793b481954d2':
Import translations. DO NOT MERGE
|
2015-07-15 17:08:33 +00:00 |
|
Geoff Mendal
|
63917040f1
|
am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '74d4fdc31c8b3893c498c26e833eabe86f03fb57':
Import translations. DO NOT MERGE
|
2015-07-15 17:08:32 +00:00 |
|
Geoff Mendal
|
cc34158af0
|
am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '16ad0293117e18b90d4140a4e3241cd84a1f28a9':
Import translations. DO NOT MERGE
|
2015-07-15 17:08:30 +00:00 |
|
Qiwen Zhao
|
247aef7564
|
am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '490701a3feb84f73e5af9a2c4740f4d4be8455b7':
|
2015-07-15 17:08:30 +00:00 |
|
Geoff Mendal
|
cce9728e2b
|
am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cf849b40df13546046d3d7c89dc63c3e8b354976':
Import translations. DO NOT MERGE
|
2015-07-15 16:54:06 +00:00 |
|
Geoff Mendal
|
74d4fdc31c
|
am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '29217bcd651d1ab968d01744533aec009fe252da':
Import translations. DO NOT MERGE
|
2015-07-15 16:54:05 +00:00 |
|
Geoff Mendal
|
16ad029311
|
am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '285c9d825d53a76548079ad527c4c79fda69ada1':
Import translations. DO NOT MERGE
|
2015-07-15 16:54:03 +00:00 |
|
Geoff Mendal
|
cf849b40df
|
Merge "Import translations. DO NOT MERGE" into mnc-dev
|
2015-07-15 16:44:45 +00:00 |
|
Geoff Mendal
|
29217bcd65
|
Merge "Import translations. DO NOT MERGE" into mnc-dev
|
2015-07-15 16:41:49 +00:00 |
|
Geoff Mendal
|
e3e9026a3a
|
Import translations. DO NOT MERGE
Change-Id: Id4a9a90498ece00ba399074bef4010ecd315aeb7
Auto-generated-cl: translation import
|
2015-07-15 09:31:30 -07:00 |
|
Geoff Mendal
|
a00589437e
|
Import translations. DO NOT MERGE
Change-Id: I41b452436ee558b42b104387eb3431d8164ab766
Auto-generated-cl: translation import
|
2015-07-15 09:30:20 -07:00 |
|
Geoff Mendal
|
285c9d825d
|
Import translations. DO NOT MERGE
Change-Id: I7b33db63242fec09f647c250e66f9eef75c7b6fa
Auto-generated-cl: translation import
|
2015-07-15 09:28:54 -07:00 |
|
Qiwen Zhao
|
0a0acc3b8d
|
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
|
2015-07-13 16:42:43 -07:00 |
|
Qiwen Zhao
|
1d1441d32a
|
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
|
2015-07-13 16:40:05 -07:00 |
|
Qiwen Zhao
|
e862217461
|
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
|
2015-07-13 16:35:27 -07:00 |
|
Qiwen Zhao
|
490701a3fe
|
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
|
2015-07-13 15:29:05 -07:00 |
|
The Android Automerger
|
b66795562b
|
am 1e14b459: am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit '1e14b4597feda704782ec8f5b7783c66aabdaa94':
|
2015-07-13 17:45:41 +00:00 |
|
Jatin Matani
|
80c9bfbd28
|
resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev
Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
|
2015-07-13 10:40:26 -07:00 |
|
The Android Automerger
|
1e14b4597f
|
am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit '98aaffaafe9246f7e3b2aff4ff605b5fbbed9f69':
|
2015-07-13 17:29:50 +00:00 |
|
The Android Automerger
|
98aaffaafe
|
am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit 'b4b19735182767df88f3a196a94c4a943423e72b':
|
2015-07-13 17:19:40 +00:00 |
|
The Android Automerger
|
b4b1973518
|
am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
* commit '01f042ccfa4530e7be2c01dbda5ed4a296ba535e':
|
2015-07-13 16:52:52 +00:00 |
|
Qiwen Zhao
|
0564deb185
|
am 741b6acb: am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit '741b6acbf88e0a08703fdab295fc2697adf6c1c6':
Remove android.util.Log from FileUtils
|
2015-07-13 16:46:24 +00:00 |
|
Qiwen Zhao
|
741b6acbf8
|
am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit 'c8edecc5432d8b1d7c487d7a6f3bc6339358afaa':
Remove android.util.Log from FileUtils
|
2015-07-13 16:32:52 +00:00 |
|
Qiwen Zhao
|
c8edecc543
|
am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
* commit '32afc638e9aed9a80cd25d0884406b7394a6ac60':
Remove android.util.Log from FileUtils
|
2015-07-13 16:20:59 +00:00 |
|
Qiwen Zhao
|
32afc638e9
|
Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
|
2015-07-13 16:10:21 +00:00 |
|
Geoff Mendal
|
87c8e92dea
|
am 2676508c: (-s ours) am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2676508c490833104929db90c4d82177dd38ab0e':
Import translations. DO NOT MERGE
|
2015-07-13 15:56:26 +00:00 |
|
Geoff Mendal
|
2e3d5f561f
|
am 1bea2964: (-s ours) am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '1bea2964fa709a5c06a5d4bf004c16425f87bc51':
Import translations. DO NOT MERGE
|
2015-07-13 15:56:22 +00:00 |
|
Geoff Mendal
|
718b0b16e5
|
am 5b704f84: (-s ours) am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '5b704f8457ac4ca5b2ca6b0e8372ab88e51d83c1':
Import translations. DO NOT MERGE
|
2015-07-13 15:56:19 +00:00 |
|
Geoff Mendal
|
475a4a0a00
|
am 9fe77811: (-s ours) am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGE
* commit '9fe7781171024a5046374d9c62d7c5affa049dc0':
Import translations. DO NOT MERGE
|
2015-07-13 15:56:18 +00:00 |
|
Jatin Matani
|
9e87bcea51
|
am c3f9f1d5: am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictionary UI
* commit 'c3f9f1d50b0e03deb78eff17d0ec2ffd522b792c':
Bring back shortcuts and add to dictionary UI
|
2015-07-13 15:56:16 +00:00 |
|
Geoff Mendal
|
2676508c49
|
am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4203b5d8d84592d78dd05db7ab0d8fb9845a3e4e':
Import translations. DO NOT MERGE
|
2015-07-13 15:32:40 +00:00 |
|
Geoff Mendal
|
1bea2964fa
|
am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '7bceb2e3791a2c4d010fd770eceef203099f2a11':
Import translations. DO NOT MERGE
|
2015-07-13 15:32:38 +00:00 |
|
Geoff Mendal
|
5b704f8457
|
am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd28a54a8315d10c78c4c40bfdd8ce5ce8be10fb9':
Import translations. DO NOT MERGE
|
2015-07-13 15:32:36 +00:00 |
|
Geoff Mendal
|
9fe7781171
|
am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGE
* commit '83c781e46c3d3d186595ef0c31a3d544edfcf62a':
Import translations. DO NOT MERGE
|
2015-07-13 15:32:35 +00:00 |
|
Jatin Matani
|
c3f9f1d50b
|
am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictionary UI
* commit '4d7a7780395a2376b566452646d1a241e165c3bf':
Bring back shortcuts and add to dictionary UI
|
2015-07-13 15:32:33 +00:00 |
|
Geoff Mendal
|
4203b5d8d8
|
am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '85a156223ceee5340ca7b6c31854d2e7ec38e0ff':
Import translations. DO NOT MERGE
|
2015-07-13 15:09:37 +00:00 |
|
Geoff Mendal
|
7bceb2e379
|
am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '0975cce068471874de7004b1bfb73f76b06bbe05':
Import translations. DO NOT MERGE
|
2015-07-13 15:09:36 +00:00 |
|
Geoff Mendal
|
d28a54a831
|
am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'b2fe54720bcf1d233f837e8528c344f6375177ee':
Import translations. DO NOT MERGE
|
2015-07-13 15:09:34 +00:00 |
|
Geoff Mendal
|
83c781e46c
|
am 98c4eba2: (-s ours) Import translations. DO NOT MERGE
* commit '98c4eba2cea310863f551af07a9c122e50ef425d':
Import translations. DO NOT MERGE
|
2015-07-13 15:09:33 +00:00 |
|