e6ccd516c0
am 234fc825: am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit '234fc82508b5349f4f829892ad1447326d9d820b':
[LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 17:36:43 +00:00
234fc82508
am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
...
* commit '464da87f3746af38aed787602beb48841d3075ae':
[LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 16:31:08 +00:00
464da87f37
[LatinIME] bring back use_personliazed_dicts_summary resource.
...
Bug: 22779653
Change-Id: Ia6af57e9a6ea59faf01c2587bab133136c5fc73a
(cherry picked from commit 6be49e8a9a26242cc9c49549c3a015662461fc48)
2015-07-28 23:06:10 +00:00
c13c53c5d5
am ca8053d7: am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit 'ca8053d7f3236b7d6df1ed6709172b2f887b477e':
Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 04:37:09 +00:00
ca8053d7f3
am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
...
* commit '707ca7692a8666989b3fbe860bee28115103988e':
Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 04:20:13 +00:00
707ca7692a
Handle Cloud Sync and SpellChecker settings when permission changed
...
This build has been compiled against API 23
This build is approved to go out with the M OTA, but may NOT be released
to the public until the Play Store has enabled API level 23 apps
Version: 4.1.2300x.build_id
1. Disable the settings.
2. Disable the feature.
3. Force reload the facilitator.
Bug: 22564048
Change-Id: Ic09742786c3e4efc034bceee836ae6a1e07307a1
(cherry picked from commit 031d04192080f0368f21c3371d1ec6af87375357)
2015-07-24 02:00:54 +00:00
1c47b2d83d
am 992144a8: am 60415866: [LatinIME] Support MNC permissions.
...
* commit '992144a8c2808c390678d57cc1163d24c63cdcb4':
[LatinIME] Support MNC permissions.
2015-07-16 00:21:56 +00:00
992144a8c2
am 60415866: [LatinIME] Support MNC permissions.
...
* commit '604158669b407a40cd0f23538fad4dce5d738f24':
[LatinIME] Support MNC permissions.
2015-07-16 00:04:12 +00:00
604158669b
[LatinIME] Support MNC permissions.
...
This build has been compiled against API 23
This build is approved to go out with the M OTA, but may NOT be released
to the public until the Play Store has enabled API level 23 apps
Version: 4.1.2300x.build_id
1. Replaces the personalization is on information with the suggest
contacts.
2. Enables "Use Contacts" only if the app has permission to read
contacts.
3. Disables the contacts dictionary in the Facilitator.
4. Do not register/read the contacts in the contact observer.
Bug: 22236416
Change-Id: I9674e13d0d0f4a2014c5024fde0178de684c07e7
2015-07-15 22:51:53 +00:00
896e619e52
am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'ef1cb855a84173417089715a595ecba6c6cde4ca':
Import translations. DO NOT MERGE
2015-07-15 17:08:41 +00:00
c9664084c7
am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'f72e120216d591f6ed1a9aa69d34009d69848108':
Import translations. DO NOT MERGE
2015-07-15 17:08:40 +00:00
e45179a2af
am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'a6d8425760ff3e10f3351545ac7e01e8626fdd8c':
Import translations. DO NOT MERGE
2015-07-15 17:08:37 +00:00
4a44f43348
am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'd6cba73e4c0ec4c4f2f47957873f0983620ff9c4':
Import translations. DO NOT MERGE
2015-07-15 17:08:35 +00:00
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
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
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
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
ef1cb855a8
am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a':
Import translations. DO NOT MERGE
2015-07-15 16:54:11 +00:00
f72e120216
am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '6aea6b9da7b779ff5f08da631f30bc5f177a3423':
Import translations. DO NOT MERGE
2015-07-15 16:54:10 +00:00
a6d8425760
am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434':
Import translations. DO NOT MERGE
2015-07-15 16:54:09 +00:00
d6cba73e4c
am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'c8e261e95bd78ab2a3926d030c0525eba0fd8ca7':
Import translations. DO NOT MERGE
2015-07-15 16:54:08 +00:00
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
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
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
7d5fb3a943
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-15 16:48:45 +00:00
6aea6b9da7
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-15 16:47:56 +00:00
1aceaa3c2b
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-15 16:47:44 +00:00
c8e261e95b
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-15 16:46:10 +00:00
cf849b40df
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-15 16:44:45 +00:00
29217bcd65
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-15 16:41:49 +00:00
f98a60cc43
Import translations. DO NOT MERGE
...
Change-Id: Iebd6e5f51a121cae7913e6ac21c4140b9c4de6f9
Auto-generated-cl: translation import
2015-07-15 09:41:01 -07:00
90a6cdb26a
Import translations. DO NOT MERGE
...
Change-Id: I922b3fb60a57db87c8bf1da3d3cd7fa976d9f5f9
Auto-generated-cl: translation import
2015-07-15 09:37:13 -07:00
8b8df7dcf1
Import translations. DO NOT MERGE
...
Change-Id: I1ce33d32d058d27eae565c1e982b491372878d25
Auto-generated-cl: translation import
2015-07-15 09:34:54 -07:00
41bffb1293
Import translations. DO NOT MERGE
...
Change-Id: Id1d45fb3ba0b84c8574bd8e326c62f2417660ce3
Auto-generated-cl: translation import
2015-07-15 09:33:27 -07:00
e3e9026a3a
Import translations. DO NOT MERGE
...
Change-Id: Id4a9a90498ece00ba399074bef4010ecd315aeb7
Auto-generated-cl: translation import
2015-07-15 09:31:30 -07:00
a00589437e
Import translations. DO NOT MERGE
...
Change-Id: I41b452436ee558b42b104387eb3431d8164ab766
Auto-generated-cl: translation import
2015-07-15 09:30:20 -07:00
285c9d825d
Import translations. DO NOT MERGE
...
Change-Id: I7b33db63242fec09f647c250e66f9eef75c7b6fa
Auto-generated-cl: translation import
2015-07-15 09:28:54 -07:00
e862217461
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
2015-07-13 16:35:27 -07:00
490701a3fe
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
2015-07-13 15:29:05 -07:00
80c9bfbd28
resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev
...
Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
2015-07-13 10:40:26 -07:00
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
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
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
32afc638e9
Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
2015-07-13 16:10:21 +00:00
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
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
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
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
0dacfff5d1
resolved conflicts for merge of d711426a to mnc-dr-dev
...
Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d
2015-07-13 03:01:27 -07:00
85a156223c
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 17:02:40 +00:00
Mohammadinamul Sheik
Geoff Mendal
Qiwen Zhao
Jatin Matani
The Android Automerger