c3cc203e4a
am f52bae18: Don\'t show download toast during SUW
...
* commit 'f52bae18050b8955b8afeb1cb573d42ac6e260c0':
Don't show download toast during SUW
2015-09-01 21:38:16 +00:00
ac7417aea6
am b0ffda93: am 4df605df: (-s ours) am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'b0ffda93a56f910682682e32f562bdf7019b5b9c':
2015-08-27 20:22:28 +00:00
25966d8ac2
am be1dc744: (-s ours) am 942137b3: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE
...
* commit 'be1dc7440b3f03e795d4cacdf217b576f5a50bfe':
2015-08-27 20:22:27 +00:00
db7167a268
am 627765c8: am f45342fe: (-s ours) am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit '627765c825b07ed6c6e769ae46f065cc8db935e8':
2015-08-27 20:22:25 +00:00
e44893356f
am f90b662f: am 41f380a9: (-s ours) am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit 'f90b662f3b597fc49208d3406953b2186be55768':
2015-08-27 20:22:23 +00:00
67b907bc45
am 396b726e: am db0081f6: (-s ours) am 60415866: [LatinIME] Support MNC permissions.
...
* commit '396b726eb175cb7287270b6f797331b2f77acfb4':
2015-08-27 20:22:20 +00:00
f07c484227
am e9cc771d: (-s ours) am 96d0e019: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'e9cc771dee56c57566a3efaaa39aa3a4a708fec2':
2015-08-27 20:22:18 +00:00
34ea770180
am a7449673: (-s ours) am 6b6db80c: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'a74496734bf2a2761c198d75c986dd3fd4d8920b':
2015-08-27 20:22:17 +00:00
f7892c0b8a
am 2cef65fb: (-s ours) am e42bad45: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '2cef65fb15974f2b0a7cf0be7bef2e9200e0312d':
2015-08-27 20:22:15 +00:00
d7f91bb404
am 87734fa8: (-s ours) am 0283bd91: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '87734fa8c3ba05b7c16aa05be06006a6cb1e8e49':
2015-08-27 20:22:13 +00:00
85b53bed8e
am dcf1904b: (-s ours) am 95199141: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'dcf1904b2e5716063e5b890ce94f0358ec761f07':
2015-08-27 20:22:12 +00:00
b0830cdcd7
am d1a615e9: (-s ours) am dbba2217: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'd1a615e9a2ab2cd18277064091c243b9b7e61d82':
2015-08-27 20:22:11 +00:00
91f9541dcd
am 0d619da9: (-s ours) am 3a7194e9: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
...
* commit '0d619da9332cc2ca440ae3dd22b43335a6b5d358':
2015-08-27 20:22:10 +00:00
effd070e99
am d70d63fa: am 5abefbb8: (-s ours) resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp
...
* commit 'd70d63fa435e87878766311676cb6e87135c4f99':
2015-08-27 20:22:08 +00:00
2326688756
am 8c3f5587: am 1791ce07: (-s ours) am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
...
* commit '8c3f5587a9e68b359b535dd5479fe54df4afa970':
2015-08-27 20:22:06 +00:00
07f8887e2b
am edc6e8cd: am c96aef22: (-s ours) resolved conflicts for merge of d711426a to mnc-dev-plus-aosp
...
* commit 'edc6e8cd3804776851b4027b9d80439dd26a2743':
2015-08-27 20:22:05 +00:00
6255ff388e
am 54fb507d: am 5fd77e2c: (-s ours) am 8c2591ee: Bring back shortcuts and add to dictionary UI
...
* commit '54fb507d51f5607754604d9676f12540b948cb2b':
2015-08-27 20:22:03 +00:00
b0ffda93a5
am 4df605df: (-s ours) am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit '4df605df74c055ee699332dc878a5430ad8c4bff':
2015-08-27 11:28:49 +00:00
be1dc7440b
am 942137b3: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE
...
* commit '942137b3e81da1e9b98e7fdf00ba7c62dbb8c922':
2015-08-27 11:28:47 +00:00
627765c825
am f45342fe: (-s ours) am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit 'f45342fec00b99daee5ab1c2cff427fc6d2f4012':
2015-08-27 11:28:46 +00:00
f90b662f3b
am 41f380a9: (-s ours) am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit '41f380a9d730fad886cca218e5abd0e286f3b244':
2015-08-27 11:28:44 +00:00
396b726eb1
am db0081f6: (-s ours) am 60415866: [LatinIME] Support MNC permissions.
...
* commit 'db0081f63c5d92ea66e9b0ed92f1d0eaf1130f42':
2015-08-27 11:28:42 +00:00
e9cc771dee
am 96d0e019: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '96d0e0194d43d3cdf04f39d5791160a91e0734bd':
2015-08-27 11:28:38 +00:00
a74496734b
am 6b6db80c: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '6b6db80ca0eb058c8af0ff98c6b89022829d5cc4':
2015-08-27 11:28:33 +00:00
2cef65fb15
am e42bad45: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'e42bad45aad096abed85ed0a0cb92e07f906820f':
2015-08-27 11:28:32 +00:00
87734fa8c3
am 0283bd91: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '0283bd910268fec571b6e918778d352f92e06e7e':
2015-08-27 11:28:30 +00:00
dcf1904b2e
am 95199141: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '9519914150fddfbb9f5024ff84102fc6ce074f93':
2015-08-27 11:28:28 +00:00
d1a615e9a2
am dbba2217: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'dbba221709b04925c3e84ccfaef4fee01684f065':
2015-08-27 11:28:26 +00:00
0d619da933
am 3a7194e9: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
...
* commit '3a7194e98e7dd84f49fe3bd1e25807d5599008f2':
2015-08-27 11:28:24 +00:00
d70d63fa43
am 5abefbb8: (-s ours) resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp
...
* commit '5abefbb8d6e2a4bfe824d9c2d8904600d41f9387':
2015-08-27 11:28:22 +00:00
8c3f5587a9
am 1791ce07: (-s ours) am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
...
* commit '1791ce07522f938a349eedeb22223449abe6c380':
2015-08-27 11:28:17 +00:00
edc6e8cd38
am c96aef22: (-s ours) resolved conflicts for merge of d711426a to mnc-dev-plus-aosp
...
* commit 'c96aef2283fb7c091c8b35071ab82d3f330c025d':
2015-08-27 11:28:14 +00:00
54fb507d51
am 5fd77e2c: (-s ours) am 8c2591ee: Bring back shortcuts and add to dictionary UI
...
* commit '5fd77e2ce94e555b06665f9ab636674669c6c6a9':
2015-08-27 11:28:10 +00:00
3dd9e2cae7
Import translations. DO NOT MERGE
...
Change-Id: I91c46c5021d7c583e43211346d9b290209ea94ca
Auto-generated-cl: translation import
2015-08-26 05:29:22 -07:00
f52bae1805
Don't show download toast during SUW
...
Check to see if setup wizard is running before showing toast to
inform user that a download was started. Note that this will only
affect the device owner; when adding new users later, the toast
will still appear. (The USER_SETUP_COMPLETE flag is hidden from
the SDK, while DEVICE_PROVISIONED remains available.)
Bug: 22594336
Change-Id: I57c42d6f821714b71cbb066e82bba2a1dbab4951
2015-08-25 17:39:00 +00:00
c36e8bf58e
Import translations. DO NOT MERGE
...
Change-Id: Ic4e38928384e43b39f41d33a461645aed396f063
Auto-generated-cl: translation import
2015-08-24 06:33:59 -07:00
ecc0969ba0
am 4009e4de: am c1ebf8ee: am 81f9a0d8: am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit '4009e4dede2be5f12bedffb9139a4eb7d6b88978':
Fix the ellipses image scaling of LatinIME
2015-08-12 21:01:43 +00:00
4009e4dede
am c1ebf8ee: am 81f9a0d8: am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'c1ebf8ee23116fddeb2c6b3260fc7f691854b193':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:53:55 +00:00
c1ebf8ee23
am 81f9a0d8: am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit '81f9a0d8f370500128d134d6e851220c20038758':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:47:30 +00:00
81f9a0d8f3
am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'a289e13927e7cd2e3d16edb96f56ced777b4c920':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:37:57 +00:00
4df605df74
am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'b0dd5cc7b235bf6e0aa59e83a58b1e902a2ff372':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:28:44 +00:00
a289e13927
am b0dd5cc7: Fix the ellipses image scaling of LatinIME
...
* commit 'b0dd5cc7b235bf6e0aa59e83a58b1e902a2ff372':
Fix the ellipses image scaling of LatinIME
2015-08-12 20:28:43 +00:00
b0dd5cc7b2
Fix the ellipses image scaling of LatinIME
...
Bug: 23082844
Change-Id: I7baac5e5a0700280906fd0f5f9351fc8dfc4c2b3
(cherry picked from commit 990e9a75b6d88ba234131612f11eac6b69c1cf84)
2015-08-12 18:03:44 +00:00
0d21507dc4
Import translations. DO NOT MERGE
...
Change-Id: If363a8e5c3c1fcc4f6a22dcc4f3b7d29e7b065af
Auto-generated-cl: translation import
2015-08-08 06:46:43 -07:00
01e1299976
Merge "Import translations. DO NOT MERGE"
2015-08-05 13:26:06 +00:00
36aef7021f
Import translations. DO NOT MERGE
...
Change-Id: I8b507cec49c21d1e52ca8047373615a8f7566410
Auto-generated-cl: translation import
2015-08-05 06:18:18 -07:00
b84b41a490
Import translations. DO NOT MERGE
...
Change-Id: Ia2602a34714db8d4d266e1a33f10ec2882cd7e98
Auto-generated-cl: translation import
2015-08-05 06:16:16 -07:00
d5a4686c72
am 683b14d9: (-s ours) am 5e5504bb: (-s ours) am 90eae721: (-s ours) am cc30f068: (-s ours) Import translations. DO NOT MERGE
...
* commit '683b14d93eb93a4ea33578acf2b744e639f43414':
Import translations. DO NOT MERGE
2015-08-01 17:55:47 +00:00
683b14d93e
am 5e5504bb: (-s ours) am 90eae721: (-s ours) am cc30f068: (-s ours) Import translations. DO NOT MERGE
...
* commit '5e5504bb69b83fb5faeeddd08e6a993ff376b969':
Import translations. DO NOT MERGE
2015-08-01 17:06:50 +00:00
5e5504bb69
am 90eae721: (-s ours) am cc30f068: (-s ours) Import translations. DO NOT MERGE
...
* commit '90eae721fe81bf43966172aba60c20ff60467bad':
Import translations. DO NOT MERGE
2015-08-01 16:55:03 +00:00
Russell Brenner
Mohammadinamul Sheik
Geoff Mendal
Jatin Matani
The Android Automerger