nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
41266 commits 1 branch 0 tags 363 MiB
Commit graph

14315 commits

Author SHA1 Message Date
Yohei Yukawa
04573e30ff Bump targetSdkVersion to "28" and minSdkVersion to "21" 
With this CL, targetSdkVersion and minSdkVersion will be bumped as
follows:

  targetSdkVersion: 23 -> 28
     minSdkVersion: 14 -> 21

As far as we know, there should be no user-visible behavior change on
supported OS versions.

Fix: 119489995
Test: manually verified that LatinIME still is functional
Change-Id: I68f1545778b0c8b44c6850f22f3f5ca25bdb6de0
 2018-11-13 13:51:59 -08:00
Yohei Yukawa
69ceec9045 Re-introduce <uses-sdk> to the main AndroidManifest.xml 
This logically reverts my previous CL [1], which moved <uses-sdk />
from AndroidManifest.xml to AndroidManifest_SdkVersion.xml, which was
later accidentally removed during Android.bp migration [2].

Since gradle support in LatinIME is still experimental and not used in
official build, it is OK to keep it broken for a while.  A more
important problem right now is letting LatinIME target API 28.

As the first step to let LatinIME target SDK 28, <uses-sdk> will be
revived in AndroidManifest.xml

 [1]: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc
      9cd42f39eb
 [2]: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
      22ebec6e2e

Bug: 110741422
Bug: 119489995
Test: manually verified that LatinIME still is functional
Change-Id: I8b04caa56fe2431c07e076fb6f97c560d5da8838
 2018-11-13 13:49:23 -08:00
TreeHugger Robot
0b6f4bb0a6 Merge "Import translations. DO NOT MERGE" 2018-11-10 15:02:17 +00:00
Bill Yi
af30ac8326 Import translations. DO NOT MERGE 
Change-Id: Iec7f8162a5f1fa6323b5aaad028982d27ae4d703
Auto-generated-cl: translation import
 2018-11-10 00:10:48 -08:00
Bill Yi
517e77569e Import translations. DO NOT MERGE 
Change-Id: I2cf19a83bd266325c4a1b37344bdab61753cdbca
Auto-generated-cl: translation import
 2018-11-09 23:51:36 -08:00
Dan Willemsen
948cbbe986 Merge "Convert to Android.bp" am: 128f68acb2 
am: 8e315deff9

Change-Id: I9d256889dbc4717293cff2b0ddd6e867ae54e47d
 2018-11-08 17:03:45 -08:00
Dan Willemsen
a23407bf62 Convert to Android.bp 
See build/soong/README.md for more information.

Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
Merged-In: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
 2018-11-01 23:09:33 +00:00
Dan Willemsen
22ebec6e2e Convert to Android.bp 
See build/soong/README.md for more information.

Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
 2018-10-31 21:49:02 -07:00
Tadashi G. Takaoka
b6301306fa Merge "Fix dicttool build" am: a92d0f9262 am: 438a303732 
am: 6aed05232b

Change-Id: I558fb5ff22a7428d1d82eac82b4caba469ed48d4
 2018-10-31 09:24:08 -07:00
Tadashi G. Takaoka
6aed05232b Merge "Fix dicttool build" am: a92d0f9262 
am: 438a303732

Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
 2018-10-31 09:18:51 -07:00
Tadashi G. Takaoka
6a1b37353d Fix dicttool build 
This CL partially reverts
  - Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
  - I05c7d8429e8d9a26139456763c77997340fea8c2
And followup (remove shortcut support)
  - I73b7dc008a5acaf75a31a36a2d332b5afabd82d0

Bug: 28255684
Test: make -j10 dicttool_aosp
Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1
 2018-10-29 15:59:05 +09:00
Bill Yi
9c8608c642 Import translations. DO NOT MERGE 
Change-Id: I60b4bb2939b9e6bb73072b3c2e96ca197c41f6f2
Auto-generated-cl: translation import
 2018-10-25 06:24:18 -07:00
TreeHugger Robot
fe42418de4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:56 +00:00
TreeHugger Robot
5958fb4cbc Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:54 +00:00
TreeHugger Robot
0ca0ed10c3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:35 +00:00
TreeHugger Robot
f1e3e4c5a8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:46:38 +00:00
TreeHugger Robot
051ebe1f67 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:44:16 +00:00
Bill Yi
54e8416096 Import translations. DO NOT MERGE 
Change-Id: Id26d6b48ca52c631b3f2041682663f07b49e4b80
Auto-generated-cl: translation import
 2018-10-13 08:35:07 -07:00
Bill Yi
946631933a Import translations. DO NOT MERGE 
Change-Id: I76dbccb4e65ebb99db55049222d6fe361d08d9fc
Auto-generated-cl: translation import
 2018-10-13 08:34:10 -07:00
Bill Yi
b0fc52fca9 Import translations. DO NOT MERGE 
Change-Id: I0606bc4b8d8c37ef386f1af4764a6887b86017f5
Auto-generated-cl: translation import
 2018-10-13 08:32:35 -07:00
Bill Yi
4f8a5c0dd6 Import translations. DO NOT MERGE 
Change-Id: Id8ca0f5d84e52df495611542f8c52e63329d531a
Auto-generated-cl: translation import
 2018-10-13 08:31:41 -07:00
Bill Yi
819b30680c Import translations. DO NOT MERGE 
Change-Id: I915ddb171c85d7f9f1428bb52e60727a9e254a60
Auto-generated-cl: translation import
 2018-10-13 08:30:21 -07:00
Bill Yi
3725a3fbca Import translations. DO NOT MERGE 
Change-Id: I521ffadf560fd919a12387844ba6799a024884b1
Auto-generated-cl: translation import
 2018-10-13 08:28:46 -07:00
Bill Yi
dacc99b4c5 Import translations. DO NOT MERGE 
Change-Id: I46a499dd1da79f06718cddfd3eafed8123a05967
Auto-generated-cl: translation import
 2018-09-28 21:46:01 -07:00
Bill Yi
47ce19e9dd Import translations. DO NOT MERGE 
Change-Id: Ib23c52e3e48c46d621a99838f101982d17308d43
Auto-generated-cl: translation import
 2018-09-26 20:54:53 -07:00
Bill Yi
0adefed05a Import translations. DO NOT MERGE 
Change-Id: Ie1e3f7f1f5c270873cecd1b84cffbb2998a09423
Auto-generated-cl: translation import
 2018-09-21 16:50:32 -07:00
Bill Yi
5acbc37fd4 Import translations. DO NOT MERGE 
Change-Id: Ic2ea9113d32f5c0e0a13ab87b0dca6f71ea3dd78
Auto-generated-cl: translation import
 2018-08-30 16:48:29 -07:00
Bill Yi
15c37f8bab Import translations. DO NOT MERGE 
Change-Id: Ie86b819785a70d5613155360f4551c77b6bf0fd0
Auto-generated-cl: translation import
 2018-08-07 17:37:26 -07:00
TreeHugger Robot
8d19c8cbf7 Merge "Import translations. DO NOT MERGE" 2018-08-02 05:34:55 +00:00
Bill Yi
e2610221be Import translations. DO NOT MERGE 
Change-Id: I4d394e997b58cd7dd2768861a3da887fdb7c1c6d
Auto-generated-cl: translation import
 2018-08-01 20:27:35 -07:00
Bill Yi
7305b0b41e Import translations. DO NOT MERGE 
Change-Id: Ifaf4318866c3ba72adee1190e0dfce8506fbd7b0
Auto-generated-cl: translation import
 2018-08-01 20:27:24 -07:00
Yohei Yukawa
c884b6631f Let Android Studio use 'shared' cert to build APK 
make build uses 'shared' cert in build/make/target/product/security/.
If LatinIME APK built with AndroidStudio doesn't use the same signing
cert, then you cannot install the APK into AOSP image, which is not
convenient.

With this CL, AndroidStudio build also uses the same signing cert.

Note that shared.keystore was built as follows.

 $ openssl pkcs8 -inform DER -nocrypt                      \
   -in build/make/target/product/security/shared.pk8       \
   -out shared.pem
 $ openssl pkcs12 -export                                  \
   -in build/make/target/product/security/shared.x509.pem  \
   -inkey shared.pem -out shared.p12                       \
   -password pass:android -name AndroidDebugKey
 $ keytool -importkeystore -deststorepass android          \
   -destkeystore shared.keystore -srckeystore shared.p12   \
   -srcstoretype PKCS12 -srcstorepass android

Fix: 110741422
Test: made sure that the APK built with Android Studio can be
      installed to an AOSP build
Change-Id: I471a87e190b15ff02bb06849e4660ed7898897a5
 2018-07-25 18:08:35 -07:00
Yohei Yukawa
41f89ae88c Specify version code in AndroidManifest.xml 
This should be the most convenient way for both make build and Android
Studio build to share the same version code.

Bug: 110741422
Test: tapas LatinIME LatinIMETests arm64 userdebug && make -j
Change-Id: I35f850c392553b2640a4c3c7398441ac28e90eca
 2018-07-25 17:08:47 -07:00
Yohei Yukawa
9cd42f39eb Move <uses-sdk /> to a differnt XML 
Basically Android Studio does want targetSdkVersion to be specified in
build.gradle rather than AndroidManifest.xml.  To make both make build
and Android Studio build happy, this CL splits <uses-sdk /> from the
main AndroidManifest.xml to a different file and let them merged in
make build.

There should be no behavior change.

Bug: 110741422
Test: Manually verified that there is no difference in
      AndroidManifest.xml in the APK.
Change-Id: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc
 2018-07-25 14:21:09 -07:00
Bill Yi
501ff64cfd Import translations. DO NOT MERGE 
Change-Id: I55e880457966992e25acd30cc65390e80fa4a515
Auto-generated-cl: translation import
 2018-07-21 20:50:09 -07:00
Yohei Yukawa
2802250415 Remove unused class PersonalDictionaryLookup 
PersonalDictionaryLookup has never been used.  Usually proguard can
remove this class but it also makes it difficult to run unit tests.

We should just remove this unused class.

Bug: 111164993
Test: compile
Test: No new test failure
Change-Id: I732db94cb3aac4ed9c6b5954679b896334a12a9c
 2018-07-04 23:13:18 -07:00
TreeHugger Robot
416889655a Merge "Import translations. DO NOT MERGE" 2018-06-27 17:38:20 +00:00
TreeHugger Robot
b5e50dd6b5 Merge "Import translations. DO NOT MERGE" 2018-06-27 17:30:51 +00:00
Bill Yi
615a9ff532 Import translations. DO NOT MERGE 
Change-Id: Ib1fbe9d70fcb60c19b0323490a6b8cb147e83bed
Auto-generated-cl: translation import
 2018-06-27 08:51:02 -07:00
Bill Yi
eb5173e7b3 Import translations. DO NOT MERGE 
Change-Id: I3494a9c6608aafc5406ca9a6f341983fe82feccc
Auto-generated-cl: translation import
 2018-06-27 08:50:14 -07:00
Bill Yi
e58de4a04e Import translations. DO NOT MERGE 
Change-Id: Ia3fb708923998222608c8c4de5617ee4ad6e936d
Auto-generated-cl: translation import
 2018-06-27 08:48:22 -07:00
TreeHugger Robot
f1185e3120 Merge "Merge inputmethodcommon into LatinIME repo" 2018-06-25 16:24:57 +00:00
Yohei Yukawa
5b65f03cff Remove an unused layout file 
This layout file was copied from Settings app but in LatinIME it has
never been used.  Also, android:onClick attributes in that layout file
are pointing to non-existing method in LatinIME, which causes lint
warnings.

Since tihs files has never been used in LatinIME, there should be no
user-visible behavior change.

Bug: 110757803
Test: tapas LatinIME && make -j
Change-Id: Ib51744979df333ac432aefc54ef7d0f413cf6161
 2018-06-24 16:50:43 -07:00
Yohei Yukawa
733a0ea406 Merge inputmethodcommon into LatinIME repo 
This is a preparation to deprecate frameworks/opt/inputmethodcommon
repository.

Currently repository 'inputmethodcommon' is used only from LatinIME.
Having such a repository only for one project is overkill.  Also, to
add gradle build support to LatinIME project, it would be much easier
LatinIME didn't have such a dependency.

This CL mechanically copies files in 'inputmethodcommon' repository to
'LatinIME' repository.  In theory there should be no behavior change.

Bug: 110741521
Test: tapas LatinIME && make -j
Change-Id: I3fabb038be9a944dcd9ef79ffcc89800a5f0bf5a
 2018-06-24 15:52:36 -07:00
TreeHugger Robot
4569741c3f Merge "Import translations. DO NOT MERGE" 2018-06-20 22:08:13 +00:00
TreeHugger Robot
92734fcbae Merge "Import translations. DO NOT MERGE" 2018-06-20 22:04:12 +00:00
Bill Yi
dd57cac3e8 Import translations. DO NOT MERGE 
Change-Id: I161eb84ec4a68d0983aeaffad5ac4b4f68e64afc
Auto-generated-cl: translation import
 2018-06-20 11:32:37 -07:00
Bill Yi
342c8a31c0 Import translations. DO NOT MERGE 
Change-Id: I5e073ffc26f474f27faafc7f0e1c28858a0f2d1a
Auto-generated-cl: translation import
 2018-06-20 11:31:47 -07:00
Bill Yi
d995f95355 Import translations. DO NOT MERGE 
Change-Id: I268ff60118e223b9645b93e6af9ec75efb2d8003
Auto-generated-cl: translation import
 2018-06-20 11:29:50 -07:00
TreeHugger Robot
92db44e865 Merge "Import translations. DO NOT MERGE" 2018-05-26 02:39:44 +00:00
Bill Yi
e5218a757b Import translations. DO NOT MERGE 
Change-Id: Ia196c88f1238f9b8332beaff05066fb585dc899f
Auto-generated-cl: translation import
 2018-05-24 17:08:22 -07:00
Bill Yi
e3406ff0c1 Import translations. DO NOT MERGE 
Change-Id: If609cecd258ccedd9073d17d342e2847e2f19909
Auto-generated-cl: translation import
 2018-05-24 16:59:38 -07:00
TreeHugger Robot
6ba0e76bfc Merge "Import translations. DO NOT MERGE" 2018-05-17 18:06:33 +00:00
Bill Yi
ce747fd519 Import translations. DO NOT MERGE 
Change-Id: I317ac1356bffec441fa84739514f537b28482715
Auto-generated-cl: translation import
 2018-05-17 01:33:24 -07:00
Bill Yi
4fb9889adf Import translations. DO NOT MERGE 
Change-Id: I5e52c7257c1c5e831305bf346f75a21cca1dc6c7
Auto-generated-cl: translation import
 2018-05-17 01:32:05 -07:00
vineel sadineni
d256927b93 Migrated various apps under packages/inputmethods/LatinIME/ to androidx 
Bug: 76692459
Test: mmma packages/inputmethods/LatinIME/
Change-Id: Ib76af6f6db1a0dd5cf64a06a4ea56151712e9692
 2018-05-15 14:55:43 -07:00
Yohei Yukawa
7a2459ca13 Merge java-overridable/ into java/ again 
This CL a logical revert of a previous CL [1], which separated Java
files into common ones and overridable ones.  Now that that overriding
concept is no longer used, there is no need to keep having separate
directory structure.

 [1]: Ic734bd4d20aa050c688a3158b1a382ae0ac18991
      fb74ab15c1

Fix: 79323502
Test: make -j aosp_taimen-userdebug && make -j
Test: tapas LatinIME && make -j
Change-Id: I2090bc25d18e6d4f24e91c2cbfe832755cbb4e8f
 2018-05-06 20:46:17 -07:00
android-build-team Robot
b280820dc4 Merge "Import translations. DO NOT MERGE" 2018-05-02 14:24:22 +00:00
android-build-team Robot
b144f0f54a Merge "Import translations. DO NOT MERGE" 2018-05-02 14:14:21 +00:00
android-build-team Robot
d6b7fb7cbe Merge "Import translations. DO NOT MERGE" 2018-05-02 14:14:02 +00:00
android-build-team Robot
98264d92c2 Merge "Import translations. DO NOT MERGE" 2018-05-02 14:13:29 +00:00
Bill Yi
b3a487c620 Import translations. DO NOT MERGE 
Change-Id: I9e53e7535fda1d3968ee37663fcc10a0db31eeb3
Auto-generated-cl: translation import
 2018-05-02 00:07:14 -07:00
Bill Yi
08853eb06e Import translations. DO NOT MERGE 
Change-Id: I53811c706460dfff30ac1b6539fc767c464de499
Auto-generated-cl: translation import
 2018-05-02 00:06:29 -07:00
Bill Yi
14d86e0cac Import translations. DO NOT MERGE 
Change-Id: I0b47773d779b0bdf951c89b4f6722905be1b81b0
Auto-generated-cl: translation import
 2018-05-02 00:04:36 -07:00
Bill Yi
fb5cf9e12e Import translations. DO NOT MERGE 
Change-Id: I378efa60a01071f41b3bcdc88861051853867528
Auto-generated-cl: translation import
 2018-05-02 00:03:29 -07:00
Bill Yi
b51944dbaf Import translations. DO NOT MERGE 
Change-Id: I0446336688bb75efb9d0f8a41c035a60344a3762
Auto-generated-cl: translation import
 2018-05-02 00:02:19 -07:00
TreeHugger Robot
9cb0fc6582 Merge "Import translations. DO NOT MERGE" 2018-04-21 17:08:25 +00:00
TreeHugger Robot
f3e6e2deb8 Merge "Import translations. DO NOT MERGE" 2018-04-21 17:06:22 +00:00
TreeHugger Robot
e91c739765 Merge "Import translations. DO NOT MERGE" 2018-04-21 17:04:33 +00:00
Bill Yi
7ec343ba9a Import translations. DO NOT MERGE 
Change-Id: If993ed37322c2c3301a0e89295872afa4a0f7992
Auto-generated-cl: translation import
 2018-04-21 06:50:09 -07:00
Bill Yi
a918b1df6a Import translations. DO NOT MERGE 
Change-Id: I5a2cfb0ec96d21a24892d0d023d10c7dad4c3af1
Auto-generated-cl: translation import
 2018-04-21 06:49:52 -07:00
Bill Yi
7f3fbc5e37 Import translations. DO NOT MERGE 
Change-Id: I8eaa684412c0b0ce80d6746f3a275c61ce5fa820
Auto-generated-cl: translation import
 2018-04-21 06:49:14 -07:00
Bill Yi
57314e45d6 Import translations. DO NOT MERGE 
Change-Id: I3df9864cae24cf551c0f9394fd62491655fe648b
Auto-generated-cl: translation import
 2018-04-21 06:48:46 -07:00
TreeHugger Robot
0fb751de7b Merge "Import translations. DO NOT MERGE" 2018-04-14 15:26:21 +00:00
TreeHugger Robot
a56f89f4f1 Merge "Import translations. DO NOT MERGE" 2018-04-14 15:24:40 +00:00
Bill Yi
9cd11a83df Import translations. DO NOT MERGE 
Change-Id: I6137657e2be2a5b55cb90d4f051715f17eb604e3
Auto-generated-cl: translation import
 2018-04-14 04:44:06 -07:00
Bill Yi
d45c50674e Import translations. DO NOT MERGE 
Change-Id: I1f85f835cd9ef6a116e44a2821f9f6e5f9f3dabe
Auto-generated-cl: translation import
 2018-04-14 04:42:17 -07:00
Bill Yi
95ca14565c Import translations. DO NOT MERGE 
Change-Id: Idad2d42b1bedbfe6fa522ff2a885fb5d2d98915a
Auto-generated-cl: translation import
 2018-04-14 04:36:38 -07:00
TreeHugger Robot
29ec5a0368 Merge "Import translations. DO NOT MERGE" 2018-04-11 23:36:36 +00:00
TreeHugger Robot
3b24f730b7 Merge "Import translations. DO NOT MERGE" 2018-04-11 23:20:42 +00:00
Bill Yi
e1b32f9fc8 Import translations. DO NOT MERGE 
Change-Id: I36f2f6dc4bb1f2792e9302a2892a44c2f8ec776f
Auto-generated-cl: translation import
 2018-04-11 10:58:15 -07:00
Bill Yi
acddce3368 Import translations. DO NOT MERGE 
Change-Id: I5fee973bbec1c45e90f9d9a0bc83ab67aa6606ca
Auto-generated-cl: translation import
 2018-04-11 10:58:02 -07:00
Bill Yi
bdf967df86 Import translations. DO NOT MERGE 
Change-Id: I654a25fe5562eca1086a5707bfd28d0c5d6ed7d5
Auto-generated-cl: translation import
 2018-04-11 10:57:31 -07:00
Bill Yi
6ad8431592 Import translations. DO NOT MERGE 
Change-Id: I67312aec8a571d0a3397caa4624dabe644629430
Auto-generated-cl: translation import
 2018-04-04 20:15:25 -07:00
TreeHugger Robot
e02661104a Merge "Import translations. DO NOT MERGE" 2018-03-29 21:29:34 +00:00
Bill Yi
c8ddf9c836 Import translations. DO NOT MERGE 
Change-Id: I2d155bdb804a1142fbb882751dea5bb66f428f57
Auto-generated-cl: translation import
 2018-03-29 13:09:15 -07:00
Bill Yi
e1a85589b0 Import translations. DO NOT MERGE 
Change-Id: Ibabb404dec76f16cfb769096bf47363d2b0b29b0
Auto-generated-cl: translation import
 2018-03-29 13:06:08 -07:00
Bill Yi
dffcb3b27e Import translations. DO NOT MERGE 
Change-Id: Ice8286a5c35c59ca4e1a771585e5dbd6058051a6
Auto-generated-cl: translation import
 2018-03-23 18:12:02 -07:00
TreeHugger Robot
bf0dbd4cc2 Merge "Import translations. DO NOT MERGE" 2018-03-16 22:14:26 +00:00
TreeHugger Robot
17f6106f29 Merge "Import translations. DO NOT MERGE" 2018-03-16 22:14:23 +00:00
TreeHugger Robot
0b4488568f Merge "Import translations. DO NOT MERGE" 2018-03-16 22:05:17 +00:00
TreeHugger Robot
3882af2ef8 Merge "Import translations. DO NOT MERGE" 2018-03-16 22:01:48 +00:00
Bill Yi
ce963f1175 Import translations. DO NOT MERGE 
Change-Id: Ibfd28d093f8e1009db963d5046ca37a595f7c571
Auto-generated-cl: translation import
 2018-03-16 10:53:11 -07:00
Bill Yi
e79a912ed4 Import translations. DO NOT MERGE 
Change-Id: I594310c4cfb895f1cb76bb742a36801db40194b3
Auto-generated-cl: translation import
 2018-03-16 10:52:16 -07:00
Bill Yi
d7437d225f Import translations. DO NOT MERGE 
Change-Id: Ic3ebf1761f2d6a4fcf1a28b4b285946e275fa849
Auto-generated-cl: translation import
 2018-03-16 10:52:09 -07:00
Bill Yi
c44c3e800b Import translations. DO NOT MERGE 
Change-Id: I65f68a96e3a73c635ec0cc10bac66253a3c35178
Auto-generated-cl: translation import
 2018-03-16 10:52:03 -07:00
Bill Yi
5686c6a181 Import translations. DO NOT MERGE 
Change-Id: Ib74b519b36e8eb17c3868dc39b2f642ca8fcf86a
Auto-generated-cl: translation import
 2018-03-16 10:51:50 -07:00
TreeHugger Robot
21e93b6e39 Merge "Import translations. DO NOT MERGE" 2018-03-14 20:15:19 +00:00
TreeHugger Robot
ed57a8be5f Merge "Import translations. DO NOT MERGE" 2018-03-14 20:08:21 +00:00
TreeHugger Robot
31bfb7dd7f Merge "Import translations. DO NOT MERGE" 2018-03-14 18:50:17 +00:00