08c5faec51
am 4057ac6c: (-s ours) am 53582b99: (-s ours) am c4391d6d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '4057ac6c514bb5b49cfacc79972b8915979ca73f':
Import translations. DO NOT MERGE
2015-09-19 03:10:58 +00:00
a5828c0d62
am 14c8f977: (-s ours) am 05272139: (-s ours) am 2aeff372: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '14c8f9778daeb5da1a601d03aa7d1747df203923':
Import translations. DO NOT MERGE
2015-09-19 03:10:56 +00:00
ab67e124a8
am 0c2230ef: (-s ours) am 4b794978: (-s ours) am efdd98c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '0c2230efee7cee23e7697c118568a3a2b693e943':
Import translations. DO NOT MERGE
2015-09-19 03:10:55 +00:00
504f6d2f47
am 4988c1db: (-s ours) am 273fad33: (-s ours) am 2e0177bc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '4988c1db5af2b52ac0256bccbe9cb8ffff3162de':
Import translations. DO NOT MERGE
2015-09-19 03:10:54 +00:00
c0ddc74f93
am 333e8b14: (-s ours) am 3c0e6db0: (-s ours) am 2899c7f3: (-s ours) Import translations. DO NOT MERGE
...
* commit '333e8b14fa22e71221f41b17ff178a5845ca878b':
Import translations. DO NOT MERGE
2015-09-19 03:10:52 +00:00
4057ac6c51
am 53582b99: (-s ours) am c4391d6d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '53582b99716accb3c2a66ca854b41ac9c74ee9c1':
Import translations. DO NOT MERGE
2015-09-19 02:56:10 +00:00
14c8f9778d
am 05272139: (-s ours) am 2aeff372: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '05272139362ebf56b9eac1938e329da94abbdba4':
Import translations. DO NOT MERGE
2015-09-19 02:56:09 +00:00
0c2230efee
am 4b794978: (-s ours) am efdd98c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '4b7949788a3c325d5a3932301736264eb27433dc':
Import translations. DO NOT MERGE
2015-09-19 02:56:07 +00:00
4988c1db5a
am 273fad33: (-s ours) am 2e0177bc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '273fad3349838601a53d694e503480ea1041f9a7':
Import translations. DO NOT MERGE
2015-09-19 02:56:06 +00:00
333e8b14fa
am 3c0e6db0: (-s ours) am 2899c7f3: (-s ours) Import translations. DO NOT MERGE
...
* commit '3c0e6db0ee334205974b2f14989ff11dadafa9d7':
Import translations. DO NOT MERGE
2015-09-19 02:56:04 +00:00
53582b9971
am c4391d6d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'c4391d6d4f632f3f5172ffe7fe9efe9901f67dfd':
Import translations. DO NOT MERGE
2015-09-19 02:48:47 +00:00
0527213936
am 2aeff372: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '2aeff372095d716ccd066be400679b361fb19f41':
Import translations. DO NOT MERGE
2015-09-19 02:48:46 +00:00
4b7949788a
am efdd98c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'efdd98c8ab5f0e321113afca449f092c89ef6175':
Import translations. DO NOT MERGE
2015-09-19 02:48:44 +00:00
273fad3349
am 2e0177bc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '2e0177bc03f374c527c8716b0b79f878f8f21241':
Import translations. DO NOT MERGE
2015-09-19 02:48:43 +00:00
3c0e6db0ee
am 2899c7f3: (-s ours) Import translations. DO NOT MERGE
...
* commit '2899c7f3ca86b6fb4fd648ed4c90ecaf0621bdd8':
Import translations. DO NOT MERGE
2015-09-19 02:48:42 +00:00
c4391d6d4f
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-19 02:37:26 +00:00
2aeff37209
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-19 02:37:24 +00:00
efdd98c8ab
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-19 02:37:22 +00:00
2e0177bc03
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-19 02:37:14 +00:00
2899c7f3ca
Import translations. DO NOT MERGE
...
Change-Id: I4dcc36e1ececec8c5aae85f8bbe27881143e88ab
Auto-generated-cl: translation import
2015-09-18 10:56:53 -07:00
4aa751eccc
Import translations. DO NOT MERGE
...
Change-Id: Ib7a938015a765e4ec57a0c18a3f0eacf1633d3c7
Auto-generated-cl: translation import
2015-09-18 10:53:14 -07:00
f70cf89597
Import translations. DO NOT MERGE
...
Change-Id: I8f0cf22104ef4bb1ef8a6b2f808fa951416fc77b
Auto-generated-cl: translation import
2015-09-18 10:51:47 -07:00
2b426c42fa
Import translations. DO NOT MERGE
...
Change-Id: Id0ddfbfaff054841dba8fe4f2610a96b267cb66a
Auto-generated-cl: translation import
2015-09-18 10:51:00 -07:00
e18ebde1fb
Import translations. DO NOT MERGE
...
Change-Id: I54db85192abdcd42e89e16ef6912759c6bee74b4
Auto-generated-cl: translation import
2015-09-18 10:50:00 -07:00
04be0e3a2f
am a6783987: am c3cc203e: am f52bae18: Don\'t show download toast during SUW
...
* commit 'a6783987ff6e9b9a97e68c0b0e2d7af5c88d8080':
Don't show download toast during SUW
2015-09-03 04:22:40 +00:00
a6783987ff
am c3cc203e: am f52bae18: Don\'t show download toast during SUW
...
* commit 'c3cc203e4ac9702e40d3e8ebad94b973f4271a3a':
Don't show download toast during SUW
2015-09-01 21:48:05 +00:00
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
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
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
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
Baligh Uddin
Russell Brenner
Mohammadinamul Sheik
Geoff Mendal
Jatin Matani
The Android Automerger