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

12525 commits

Author SHA1 Message Date
Jean Chalard
10ac940312 Merge "[ML24] Add facilities to read the script of a subtype" 2014-10-14 11:26:07 +00:00
Jean Chalard
b256bb5791 [ML24] Add facilities to read the script of a subtype 
...or more exactly, the script of the keyboard layout set associated
with a given subtype.

Bug: 11230254
Change-Id: I82f5fc81ecffc561781816008c853be6ff9438dd
 2014-10-14 20:19:15 +09:00
Keisuke Kuroyanagi
fb09fa1b22 am d1471ee0: Merge "Remove shouldBlockAutoCorrectionBySafetyNet" 
* commit 'd1471ee053a788dd68729d0a8a603c17444f7cb3':
  Remove shouldBlockAutoCorrectionBySafetyNet
 2014-10-14 10:57:16 +00:00
Keisuke Kuroyanagi
d1471ee053 Merge "Remove shouldBlockAutoCorrectionBySafetyNet" 2014-10-14 10:52:32 +00:00
Tadashi G. Takaoka
c4ffa235e5 Add JSR305 annotation to LeakGuardHandlerWrapper 
Change-Id: I7456200af739db4510c5549b7bc894fb48749455
 2014-10-14 18:19:22 +09:00
Ken Wakasa
cbffb79584 am 95f100ba: Merge "Performance fix for multiple language subtypes" 
* commit '95f100ba404c3f905739db628ec71b7c1b7b5ace':
  Performance fix for multiple language subtypes
 2014-10-14 06:45:26 +00:00
Ken Wakasa
95f100ba40 Merge "Performance fix for multiple language subtypes" 2014-10-14 06:42:14 +00:00
Jean Chalard
d15f6e8c98 Performance fix for multiple language subtypes 
The code would iterate all enabled subtypes each time
getCurrentSubtype() is called, which is really quite frequent.

Bug: 11230254
Change-Id: I91feb36de6eca84967e848fc585aae04b350be89
 2014-10-14 15:13:35 +09:00
Jean Chalard
5f8823c1ce am 9959140f: Merge "Fix an NPE." 
* commit '9959140f15edcb32c21406e3cff80ad6856e83c9':
  Fix an NPE.
 2014-10-14 02:57:23 +00:00
Jean Chalard
9959140f15 Merge "Fix an NPE." 2014-10-14 02:51:16 +00:00
Jean Chalard
7d74594123 Fix an NPE. 
Bug: 17958289
Change-Id: I5c9ea668ff75b38c7ddebd767c36a950835c0c9f
 2014-10-14 11:42:43 +09:00
Sandeep Siddhartha
390fe20fde am cbd59e02: Merge "Don\'t restore debug preferences" 
* commit 'cbd59e02a97dac53ec97f59c1a638bc421ba4a52':
  Don't restore debug preferences
 2014-10-14 02:32:58 +00:00
Sandeep Siddhartha
cbd59e02a9 Merge "Don't restore debug preferences" 2014-10-14 02:28:50 +00:00
Keisuke Kuroyanagi
29b4f7aa67 Remove shouldBlockAutoCorrectionBySafetyNet 
Bug: 13756409

[Category diff]
+1      27
-1       0
+2       0
-2       0
+3       0
-3       1
+4      11
-4       0
+5      51
-5       0
+6       0
-6      38
+7       0
-7      50

[Weighted category diff]
+1      28
-1       0
+2       0
-2       0
+3       0
-3       1
+4      11
-4       0
+5      51
-5       0
+6       0
-6      39
+7       0
-7      50

show diff for ./en_user_log_phones_2011_08.csv
+1       4
+4       5
+5       7
-6       9
-7       7

The increase of false positives comes from the spaceless
typing test cases that are synthetic data.

Change-Id: I4ea77aa56ebfaa5518c71107169e1d2332de6327
 2014-10-14 11:20:33 +09:00
Sandeep Siddhartha
06a438d3a5 Don't restore debug preferences 
Bug: 17942814
Change-Id: I0bbef716dff47ed8eb880209d448629ad853b904
 2014-10-13 18:59:48 -07:00
Tadashi G. Takaoka
ae3ad8ebdd (DO NOT MERGE) Fix checking a11y status just before calling an a11y method 
Cherry picked from Master, commit 04cd8794e0

Bug: 17035860
Change-Id: I9627d525a570ced085281b4db93fe6896081e818
 2014-10-14 01:40:27 +00:00
Sandeep Siddhartha
6998ff4b8e am 59f5988a: Merge "Cleanup LoginAccountUtils" 
* commit '59f5988a16bfd979f748ecd356b528f0b933a42c':
  Cleanup LoginAccountUtils
 2014-10-14 00:10:18 +00:00
Sandeep Siddhartha
59f5988a16 Merge "Cleanup LoginAccountUtils" 2014-10-14 00:06:52 +00:00
Sandeep Siddhartha
19084d076a Cleanup LoginAccountUtils 
Bug: 17464068
Change-Id: Icf994a7582491afebc5db522c127a30d079ce05c
 2014-10-13 12:23:22 -07:00
Geoff Mendal
164a49969e Merge "Import translations. DO NOT MERGE" 2014-10-13 18:32:43 +00:00
Geoff Mendal
6c6371427b Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2014-10-13 18:32:34 +00:00
Geoff Mendal
3c68a82ae8 Merge "Import translations. DO NOT MERGE" 2014-10-13 18:27:20 +00:00
Geoff Mendal
e995d5ea0e Merge "Import translations. DO NOT MERGE" 2014-10-13 18:25:12 +00:00
Geoff Mendal
38b624cd04 Merge "Import translations. DO NOT MERGE" 2014-10-13 18:24:40 +00:00
Geoff Mendal
fd6bec7dee Import translations. DO NOT MERGE 
Change-Id: Ie47de03c285de6dcaa6dc9b86dcf027f1c55825f
Auto-generated-cl: translation import
 2014-10-13 11:04:13 -07:00
Geoff Mendal
2fd41677eb Import translations. DO NOT MERGE 
Change-Id: I6c78be329b4ac88d1a74c814aa2a23ad0f608adc
Auto-generated-cl: translation import
 2014-10-13 11:02:54 -07:00
Geoff Mendal
c471349789 Import translations. DO NOT MERGE 
Change-Id: I7dbac96009086e57a4f3199f86aa6340022e44cc
Auto-generated-cl: translation import
 2014-10-13 10:56:50 -07:00
Geoff Mendal
32f3921bad Import translations. DO NOT MERGE 
Change-Id: I274ecd1d6c5c26aaa75abff4129b0e082369d5c7
Auto-generated-cl: translation import
 2014-10-13 10:53:17 -07:00
Geoff Mendal
4a77b6bf11 Import translations. DO NOT MERGE 
Change-Id: I64b846864646430dccaf5f58f788b5c5cb485970
Auto-generated-cl: translation import
 2014-10-13 10:50:20 -07:00
Geoff Mendal
f3802c566b Import translations. DO NOT MERGE 
Change-Id: I0f02b34c3de602cc6ebe04e1859b31d08b0e95a3
Auto-generated-cl: translation import
 2014-10-13 10:48:09 -07:00
Geoff Mendal
1bcf5873ac Import translations. DO NOT MERGE 
Change-Id: Ic263dcea659b3133f5ebd7666f7d1c702a4ebddc
Auto-generated-cl: translation import
 2014-10-13 10:46:23 -07:00
Sandeep Siddhartha
c11c9d262d am d9015233: Set up a sync preference and policy for syncing [2] 
* commit 'd9015233f50724294bb408f1c56715a581dc4bed':
  Set up a sync preference and policy for syncing [2]
 2014-10-10 23:18:32 +00:00
Sandeep Siddhartha
d9015233f5 Set up a sync preference and policy for syncing [2] 
- Adds a preference for enabling sync, which controls the sync behavior
- Make the ProductionFlags depend on appropriate flags to guarantee that
  we don't mess things when flipping some flags
- Preferences now control the "syncable" property of the provider
  thereby controlling the policy and when this entry shows up in
  system settings.

Bug: 17464069
Change-Id: I1d58351188518c1ae9f1f9e147b5ea15d32a3427
 2014-10-10 16:03:54 -07:00
Sandeep Siddhartha
2c7a1c91c9 am 1e10d29b: Don\'t restore device specific preferences 
* commit '1e10d29bc8975ea45ca5e3bdf1936aa418161bcb':
  Don't restore device specific preferences
 2014-10-10 18:19:05 +00:00
Sandeep Siddhartha
1e10d29bc8 Don't restore device specific preferences 
There are two categories of preferences:
1. That are part of the default shared preference
   They were all getting backed up and restored.
   Added a blacklist to not restore some of these.
   e.g. current account

2. That are in a non-default shared preference file.
   These are not getting backed up currently, but added a specific
   local preference file for all such preferences.

Bug: 17288591
Change-Id: I2f748be971a2337543e5014434aa39313fd1e1d8
 2014-10-10 10:49:32 -07:00
Tadashi G. Takaoka
287d2dcab5 am 6e565332: Merge "Fixing keyboard theme selection" 
* commit '6e565332df385d67d58543879f9d81263e667c06':
  Fixing keyboard theme selection
 2014-10-10 09:32:23 +00:00
Tadashi G. Takaoka
6e565332df Merge "Fixing keyboard theme selection" 2014-10-10 09:28:24 +00:00
Jean Chalard
e3bd12a827 am 7d5e1cb2: [ML23] Introduce a different accuracy/performance tradeoff 
* commit '7d5e1cb2650d74816767c085ad71d04d6e605559':
  [ML23] Introduce a different accuracy/performance tradeoff
 2014-10-10 09:24:39 +00:00
Jean Chalard
7d5e1cb265 [ML23] Introduce a different accuracy/performance tradeoff 
Bug: 11230254
Change-Id: Ic09518c818ae7b68942b1c63160dd462e5922cb5
 2014-10-10 18:02:52 +09:00
Tadashi G. Takaoka
4f17f3df46 Fixing keyboard theme selection 
Bug: 17937287
Change-Id: I476045980843c5897820cd544daea06fa991acb5
 2014-10-10 17:42:03 +09:00
Jean Chalard
8beebbf8b1 am 5d2d852e: [ML22] Improve the language on spacebar for SLS 
* commit '5d2d852eb0caaf7416c159f83d51e07b1ca87e30':
  [ML22] Improve the language on spacebar for SLS
 2014-10-10 07:31:34 +00:00
Jean Chalard
5d2d852eb0 [ML22] Improve the language on spacebar for SLS 
Bug: 11230254
Change-Id: Ib54be1a2a77b6e80cdff1af89a7b4203ea859716
 2014-10-10 16:19:48 +09:00
Jatin Matani
e78c86c5fb am 701b14ff: Merge "Make SuggestionWordInfo non-final for testabilty" 
* commit '701b14ffa604df48bdc5c6287c9ba296ef8a02db':
  Make SuggestionWordInfo non-final for testabilty
 2014-10-10 06:29:28 +00:00
Jatin Matani
701b14ffa6 Merge "Make SuggestionWordInfo non-final for testabilty" 2014-10-10 05:18:55 +00:00
Tadashi G. Takaoka
c986a6bec1 am fee22c2a: Fix asset name 
* commit 'fee22c2aaf3f6114848c40a7e6f1feca045feb48':
  Fix asset name
 2014-10-10 02:23:55 +00:00
Tadashi G. Takaoka
fee22c2aaf Fix asset name 
Change-Id: I7a2609af13c3ed7e6333a6af87cb113addd82f34
 2014-10-10 11:07:22 +09:00
Sandeep Siddhartha
c4521eb19f am 80f0e89a: Remove UsedForTesting tags from BlockingHttpClient 
* commit '80f0e89aaf1a3e7063bb4e9c3b930b6d7e460a6c':
  Remove UsedForTesting tags from BlockingHttpClient
 2014-10-10 00:18:35 +00:00
Sandeep Siddhartha
80f0e89aaf Remove UsedForTesting tags from BlockingHttpClient 
Bug: 17464069
Change-Id: I45aa6da0e339ffb56de613c2a0a43fe37fb2defd
 2014-10-09 14:30:45 -07:00
Jatin Matani
d00ef4f691 am eaf517ff: Merge "Changes related Sync Engine library that communicates to cloud server" 
* commit 'eaf517ffea7f700a4249eac5c61837fd101320a7':
  Changes related Sync Engine library that communicates to cloud server
 2014-10-09 18:11:08 +00:00
Jatin Matani
eaf517ffea Merge "Changes related Sync Engine library that communicates to cloud server" 2014-10-09 18:06:32 +00:00
Jean Chalard
e06fe74d99 am bc180059: Always show the typed word in recorrections. 
* commit 'bc18005948c3872a96bd3406e7dd2c722d60a013':
  Always show the typed word in recorrections.
 2014-10-09 12:02:13 +00:00
Keisuke Kuroyanagi
f49a1ec120 am 41302021: Merge "Rename updateCounter to updateEntriesForWordWithNgramContext." 
* commit '41302021d61d3c876fe3952089ff211bab0abb4e':
  Rename updateCounter to updateEntriesForWordWithNgramContext.
 2014-10-09 12:02:11 +00:00
Keisuke Kuroyanagi
ef37d49e1b am fca049a4: Merge "Extend jni method to dump ngram entries." 
* commit 'fca049a4b01a92f2f59d790898f8aedb13ad7e7d':
  Extend jni method to dump ngram entries.
 2014-10-09 12:02:09 +00:00
Yohei Yukawa
a4217f5a92 am 65473118: Merge "Simplify CursorAnchorInfoCompatWrapper" 
* commit '65473118655817c7f5382d91c7c4e3d734262a3a':
  Simplify CursorAnchorInfoCompatWrapper
 2014-10-09 12:02:07 +00:00
Jean Chalard
4099611d64 am 437fcbaa: [ML20.1] Move getRichInputMethodSubtype to additional features 
* commit '437fcbaa9f9e7de6ccdb6c9ac5f977c0aa6e6bc6':
  [ML20.1] Move getRichInputMethodSubtype to additional features
 2014-10-09 12:02:06 +00:00
Jean Chalard
12250e2492 am 176e6e22: Merge "[ML19] Actually switch the language when appropriate" 
* commit '176e6e22cff8a3f77e121371a91419aa295abb65':
  [ML19] Actually switch the language when appropriate
 2014-10-09 12:02:02 +00:00
Tadashi G. Takaoka
8e5dac104f am 15480481: Add keyboard shadow 
* commit '15480481be790c913b0117d0841565efd399cd01':
  Add keyboard shadow
 2014-10-09 12:01:38 +00:00
Jean Chalard
bc18005948 Always show the typed word in recorrections. 
Bug: 11330140
Bug: 17875601
Bug: 17623275
Change-Id: Ie4620f36f312c54c7b01b5f6cbdb0bc9171b6179
 2014-10-09 17:54:58 +09:00
Keisuke Kuroyanagi
41302021d6 Merge "Rename updateCounter to updateEntriesForWordWithNgramContext." 2014-10-09 08:51:18 +00:00
Keisuke Kuroyanagi
ab4437f468 Rename updateCounter to updateEntriesForWordWithNgramContext. 
Bug: 14425059
Change-Id: Id9b0dd7e32c711ed4292981517c3febd5fe9e897
 2014-10-09 17:34:29 +09:00
Keisuke Kuroyanagi
fca049a4b0 Merge "Extend jni method to dump ngram entries." 2014-10-09 08:28:13 +00:00
Yohei Yukawa
6547311865 Merge "Simplify CursorAnchorInfoCompatWrapper" 2014-10-09 08:13:50 +00:00
Jean Chalard
437fcbaa9f [ML20.1] Move getRichInputMethodSubtype to additional features 
Bug: 11230254
Change-Id: I9bc19db5f101eeb6841394fe3637f271c93cbfa7
 2014-10-09 16:35:15 +09:00
Jatin Matani
db1b736446 Changes related Sync Engine library that communicates to cloud server 
This change updates some of the code that the library uses
to communicate with the cloud server
Specifically :
- Update BlockingHttpClient to use template ResponseProcessor
- Update HttpUrlConnectionBuilder to setAuthToken for HttpUrlConnection

Bug: 17464069
Bug: 17464805

Change-Id: I7d7b58dff594b920162f799d102e8582ff9fe6a4
 2014-10-09 00:01:32 -07:00
Yohei Yukawa
dac49f9f6d Simplify CursorAnchorInfoCompatWrapper 
With this CL, we will use CursorAnchorInfoCompatWrapper just to
avoid unexpected NoClassDefFoundError due to the direct
dependency CursorAnchorInfo class, which is available only on
API level 21 and later.

Change-Id: I254ff83f1ca41daa21d0666b5824af22ba529022
 2014-10-09 15:54:34 +09:00
Keisuke Kuroyanagi
d7a51c242b Extend jni method to dump ngram entries. 
Bug: 14425059
Change-Id: Ib03b58525fae12f254b45630bee31ecbdde227b1
 2014-10-09 15:26:10 +09:00
Jean Chalard
176e6e22cf Merge "[ML19] Actually switch the language when appropriate" 2014-10-09 05:12:01 +00:00
Jean Chalard
81a5a10476 [ML19] Actually switch the language when appropriate 
That is, when auto-correcting or when manually picking.
This is not great, but it's a good starting point.

Bug: 11230254
Change-Id: I07627f48e2de1c28053d6572c7c72625808ec79c
 2014-10-09 13:13:25 +09:00
Tadashi G. Takaoka
15480481be Add keyboard shadow 
This CL sets 8dp elevation ot input view in order to cast a shadow
onto underlying application.

Bug: 16210054
Change-Id: I7779c63612fc88e24dde65de3e4e7a45b9d1762f
 2014-10-09 12:39:15 +09:00
Jatin Matani
45110a7bcf am 3c6ac75c: Merge "Fix messaging for sync now feature, when no account is selected" 
* commit '3c6ac75c48e0f57d389305c9c22a3be960682ed2':
  Fix messaging for sync now feature, when no account is selected
 2014-10-08 23:46:46 +00:00
Jatin Matani
3c6ac75c48 Merge "Fix messaging for sync now feature, when no account is selected" 2014-10-08 23:40:27 +00:00
Jatin Matani
f66a6a3bb0 Fix messaging for sync now feature, when no account is selected 
Change-Id: I5e81b7a1eed9c2177ad3ddfa6c96c2b85c433766
 2014-10-08 15:26:39 -07:00
Tadashi G. Takaoka
83d7e4cfef am 9bda1989: Merge "Stop dimming main keyboard while showing more keys keyboard" 
* commit '9bda19891ceb5571cb92a164061eb7912c81f2a7':
  Stop dimming main keyboard while showing more keys keyboard
 2014-10-08 13:18:47 +00:00
Tadashi G. Takaoka
9bda19891c Merge "Stop dimming main keyboard while showing more keys keyboard" 2014-10-08 13:13:26 +00:00
Jean Chalard
867c17bed0 am 15335d75: Merge "[ML18] Make WordComposer#getAutoCorrection a word info" 
* commit '15335d7526f7d8e5976a3b1aff510ec9adf842fc':
  [ML18] Make WordComposer#getAutoCorrection a word info
 2014-10-08 13:09:39 +00:00
Jean Chalard
15335d7526 Merge "[ML18] Make WordComposer#getAutoCorrection a word info" 2014-10-08 13:04:25 +00:00
Jean Chalard
176ad53c6f [ML18] Make WordComposer#getAutoCorrection a word info 
Bug: 11230254
Change-Id: I6ad2e7f89862fbfe7af5502961643320c782347f
 2014-10-08 21:46:13 +09:00
Ken Wakasa
470cd28d99 am 5b39af37: Fix unit test failure 
* commit '5b39af37c00c6bb413d4b6311a22c5ba0aaaacf3':
  Fix unit test failure
 2014-10-08 09:17:33 +00:00
Ken Wakasa
5b39af37c0 Fix unit test failure 
Change-Id: I5a28c6775385ba3b0b7d86c85064fd28f3cbb353
 2014-10-08 17:27:28 +09:00
Tadashi G. Takaoka
6085839627 Stop dimming main keyboard while showing more keys keyboard 
Bug: 17910364
Change-Id: Ibe76ee86a43c5939f48e45506c985b3f289eac7a
 2014-10-08 16:59:21 +09:00
Jatin Matani
0856be7993 am 847735fd: Merge "Skeleton code for user dictionary sync" 
* commit '847735fdfacfda3fda0e3a1370a35896832cb8bb':
  Skeleton code for user dictionary sync
 2014-10-08 02:15:32 +00:00
Jatin Matani
847735fdfa Merge "Skeleton code for user dictionary sync" 2014-10-08 02:09:50 +00:00
Jatin Matani
3fbe459fa7 Make SuggestionWordInfo non-final for testabilty 
Needed for ag/563043
Bug:17731683
Change-Id: I4d19e512a311547204f7e8d7885fc886757a18b7
 2014-10-07 18:43:13 -07:00
Jatin Matani
734733d8ad Skeleton code for user dictionary sync 
Bug:17464069
Change-Id: If683b80e882c07fba576959346ae74cd445dd83e
 2014-10-07 12:30:12 -07:00
Yohei Yukawa
302e76711f am 89d7965e: Merge "Fix NoClassDefFoundError due to CursorAnchorInfo in K" 
* commit '89d7965e76da6044d593cd6dacc45147033cfc23':
  Fix NoClassDefFoundError due to CursorAnchorInfo in K
 2014-10-07 10:34:20 +00:00
Yohei Yukawa
89d7965e76 Merge "Fix NoClassDefFoundError due to CursorAnchorInfo in K" 2014-10-07 10:30:36 +00:00
Yohei Yukawa
883bfd2c0b Fix NoClassDefFoundError due to CursorAnchorInfo in K 
Check API level before touching CursorAnchorInfo that is only
available in L and later.

BUG: 17891202
Change-Id: I6e8d2e3f071bd78bed8c1d24ba2b97207dea3044
 2014-10-07 19:19:20 +09:00
Jean Chalard
f3339bb19f am be4e1539: [ML17] Add a method to switch the most probable language 
* commit 'be4e1539cb3be157a000a500598be8bd15a2477d':
  [ML17] Add a method to switch the most probable language
 2014-10-07 10:14:34 +00:00
Jean Chalard
be4e1539cb [ML17] Add a method to switch the most probable language 
Also directly hold a ref to it. It's simpler for now, though
we may want to remove it completely later to have a flat,
purely weight-based system with no preference.
Also split weights between gesturing and typing.

Bug: 11230254
Change-Id: Ica15964a193ae6e7f14c85a9a3ed806130fa7efb
 2014-10-07 19:09:49 +09:00
Jean Chalard
d46950c056 am 38ec825e: [ML16] Remove DictionaryFacilitator.getLocale() 
* commit '38ec825ef896db5f90025d86caded938df606194':
  [ML16] Remove DictionaryFacilitator.getLocale()
 2014-10-07 09:17:43 +00:00
Jean Chalard
38ec825ef8 [ML16] Remove DictionaryFacilitator.getLocale() 
Bug: 11230254
Change-Id: Ife99df42bc145fbd2d5c3128330bc0f88b104de9
 2014-10-07 16:44:26 +09:00
Jean Chalard
42666bda43 am ea077349: [ML15] First step in removing DictionaryFacilitator.getLocale 
* commit 'ea077349563d704dc3fdecf31a6f9f7f95ce4ad4':
  [ML15] First step in removing DictionaryFacilitator.getLocale
 2014-10-07 07:24:21 +00:00
Jean Chalard
ea07734956 [ML15] First step in removing DictionaryFacilitator.getLocale 
Bug: 11230254
Change-Id: Ied010ec6f1024080e8a499f682d2fc1780e82ef7
 2014-10-07 16:06:35 +09:00
Keisuke Kuroyanagi
ff0b4b6644 am 3ead4d7f: Merge "Quit having obsolete options for ime-simulator." 
* commit '3ead4d7f8a4b4f808e06bfc63ad917ef50b8c759':
  Quit having obsolete options for ime-simulator.
 2014-10-07 02:07:19 +00:00
Keisuke Kuroyanagi
3ead4d7f8a Merge "Quit having obsolete options for ime-simulator." 2014-10-07 02:03:59 +00:00
Geoff Mendal
4d6dd4a5c1 Merge "Import translations. DO NOT MERGE" 2014-10-07 01:24:06 +00:00
Geoff Mendal
50200dac21 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2014-10-07 01:23:25 +00:00
Geoff Mendal
8403f533c8 Import translations. DO NOT MERGE 
Change-Id: Id46f6934d46a5d517194656a824fc9f921a1cc04
Auto-generated-cl: translation import
 2014-10-06 18:23:25 -07:00
Geoff Mendal
5a6bdc40e8 Merge "Import translations. DO NOT MERGE" 2014-10-07 01:23:06 +00:00
Geoff Mendal
e88bb76a6a Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2014-10-07 01:22:47 +00:00