Geoff Mendal
0dcc354eda
am ec71a217: (-s ours) am 75a05460: (-s ours) am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'ec71a21787c94c0698f98316a6189d3a472bdb88':
2015-03-26 21:19:12 +00:00
Geoff Mendal
a8aab1d61d
am c634cbe1: (-s ours) am 78939d63: (-s ours) am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'c634cbe14365bac44a2bb671ede6534566ac22b8':
2015-03-26 21:19:11 +00:00
Geoff Mendal
137cc5d34e
am b48a6519: (-s ours) am fa18dac7: (-s ours) am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'b48a6519cc412aae55ef8914209b09d87f801603':
2015-03-26 21:19:09 +00:00
Geoff Mendal
39befa785c
am 3d26af83: (-s ours) am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '3d26af838690fddf9227050b18c8b03441b602c1':
2015-03-26 21:19:07 +00:00
Geoff Mendal
e7382bb53c
am b5cac103: (-s ours) am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'b5cac10334ebe1640ab39039b6fbcbac818cb75a':
2015-03-26 21:19:03 +00:00
Geoff Mendal
e50efc3072
am 01072c69: (-s ours) am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '01072c69f184b0a9c513bdddd0e3f2266e0abe8f':
2015-03-26 21:19:02 +00:00
Geoff Mendal
48c03762e8
am b3cde203: (-s ours) am bbec724b: (-s ours) am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b3cde203fd67230bbbfa1421d265bb211359905c':
2015-03-26 21:19:00 +00:00
Geoff Mendal
ec71a21787
am 75a05460: (-s ours) am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '75a054602c2770fa66d85d22466f20ca2cdf7694':
2015-03-26 21:09:18 +00:00
Geoff Mendal
c634cbe143
am 78939d63: (-s ours) am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '78939d63861176fbc42008fa86a2de45cad2bbf5':
2015-03-26 21:09:16 +00:00
Geoff Mendal
b48a6519cc
am fa18dac7: (-s ours) am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'fa18dac7980dcf030757fcd9f0cb9774f65e7f6e':
2015-03-26 21:09:15 +00:00
Geoff Mendal
3d26af8386
am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '341f7ea74b30371a464994544244a8e1c0327277':
2015-03-26 21:09:13 +00:00
Geoff Mendal
b5cac10334
am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '22f10ac4016c6879f55d65b16765440ff9453f58':
2015-03-26 21:09:12 +00:00
Geoff Mendal
01072c69f1
am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e':
2015-03-26 21:09:10 +00:00
Geoff Mendal
b3cde203fd
am bbec724b: (-s ours) am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bbec724b2ae4677685a7300ae4b0c1e820cdf33a':
2015-03-26 21:09:09 +00:00
Geoff Mendal
75a054602c
am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'ef9b3c13231328e13981d979100063403f4c5768':
2015-03-26 21:05:40 +00:00
Geoff Mendal
78939d6386
am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '4172b16afadaf00168b663464d122213f664923c':
2015-03-26 21:05:38 +00:00
Geoff Mendal
fa18dac798
am 116b058b: (-s ours) am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '116b058bfb410c2c3bf0c9436645c842406d99b5':
2015-03-26 21:05:37 +00:00
Geoff Mendal
341f7ea74b
am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce':
2015-03-26 21:05:32 +00:00
Geoff Mendal
22f10ac401
am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '7424f8c587fb4802d4b923e9b512f66a28f24c97':
2015-03-26 21:05:31 +00:00
Geoff Mendal
b2a45cdc1f
am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '6b26d9d4fa6fa1e799beccbafab3278af09bf93d':
2015-03-26 21:05:29 +00:00
Geoff Mendal
bbec724b2a
am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
...
* commit '043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5':
2015-03-26 21:05:27 +00:00
Geoff Mendal
ef9b3c1323
am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'e397cbe2dffe3c7ff81567a8992f66e34df1d495':
2015-03-26 21:00:41 +00:00
Geoff Mendal
4172b16afa
am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '92aaaa88d31e21ca72d24ad047195779be83bdcd':
2015-03-26 21:00:40 +00:00
Geoff Mendal
116b058bfb
am 013b37a7: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '013b37a7e91e27eb060a6a23ac607a7172f2b058':
2015-03-26 21:00:38 +00:00
Geoff Mendal
8dc2209ebf
am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '3a496eb86cf9db788874d1b0e4628a9c3efd1a2d':
2015-03-26 21:00:37 +00:00
Geoff Mendal
7424f8c587
am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '585f624ba50bc34eb2661bf2f6d3e266d1a55acf':
2015-03-26 21:00:35 +00:00
Geoff Mendal
6b26d9d4fa
am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '256e2ffddf7e22bdf201c44a880a36e73b8f8fbe':
2015-03-26 21:00:33 +00:00
Geoff Mendal
043af5575e
am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f4d53d6fdad4335e817c6f71e730b0cf0165de0a':
2015-03-26 21:00:31 +00:00
Geoff Mendal
e397cbe2df
am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'ca58fb9c0bbe31f8d626c0c2dab39569b6a03d5a':
Import translations. DO NOT MERGE
2015-03-26 18:56:21 +00:00
Geoff Mendal
92aaaa88d3
am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '9206174e6ba94bb2b11871c983c74989684ecf4f':
Import translations. DO NOT MERGE
2015-03-26 18:56:18 +00:00
Geoff Mendal
013b37a7e9
am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a9431f676d472cb6b103f9d99e9c64de7d161f57':
Import translations. DO NOT MERGE
2015-03-26 18:56:15 +00:00
Geoff Mendal
3a496eb86c
am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'a2fd9c6cdd094e6a076949129c01ca6d10d6fa24':
Import translations. DO NOT MERGE
2015-03-26 18:56:12 +00:00
Geoff Mendal
585f624ba5
am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '5bc30df7e03f9354a03d9a5f7819cd3bdae18201':
Import translations. DO NOT MERGE
2015-03-26 18:56:08 +00:00
Geoff Mendal
256e2ffddf
am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'cad0777a4bade34d6bedd096eae712e29df99fc1':
Import translations. DO NOT MERGE
2015-03-26 18:55:58 +00:00
Geoff Mendal
f4d53d6fda
am 31d085ff: (-s ours) Import translations. DO NOT MERGE
...
* commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc':
Import translations. DO NOT MERGE
2015-03-26 18:55:57 +00:00
Mohammadinamul Sheik
8f526c9a55
Use the complete Locale in generating the dictionary id.
...
- Also deleted a couple of dead methods.
Bug:19929051
Change-Id: I4f88dbc2a8204d5e2a20d1ad8c205a23c6319f8d
2015-03-25 16:45:56 -07:00
Geoff Mendal
622093dd3a
Import translations. DO NOT MERGE
...
Change-Id: I8a29d7e960f826153ce0942fd5f4a179775377e3
Auto-generated-cl: translation import
2015-03-25 06:32:16 -07:00
Jatin Matani
3b175a0b5d
Merge "Check for accounts when enabling sync features."
2015-03-24 23:38:01 +00:00
Jatin Matani
bb2773176f
Check for accounts when enabling sync features.
...
Bug:19895917
Change-Id: I2f2f535f5a5c17c5642a5c44d2fd20a520ccfd73
2015-03-24 15:37:11 -07:00
Mohammadinamul Sheik
600cca16cb
Merge "Force download the dictionaries after the apk package is updated."
2015-03-24 22:20:46 +00:00
Mohammadinamul Sheik
3bc3bc7971
Force download the dictionaries after the apk package is updated.
...
- Also display the notification when the dictionaries are auto updated
Bug: 19808828
Change-Id: If5c4efb73d8bb554d812afcf7deafec3ac40a462
2015-03-24 14:56:54 -07:00
Jatin Matani
3b0c2eb09f
Merge "Avoid NPE when logging the entry point to Settings"
2015-03-24 19:57:08 +00:00
Jatin Matani
2fb8e5eecf
Avoid NPE when logging the entry point to Settings
...
The populator class that serializes the proto uses a switch
and throws an NPE.
Bug:19911288
Change-Id: Id0fa371b3c64e706e14a13bb6e643406f94be035
2015-03-24 12:25:22 -07:00
Dan Zivkovic
a8b14a4fdd
Merge "Change DictionaryStats to report content version."
2015-03-24 19:20:27 +00:00
Ulas Kirazci
e1b91d4138
Merge "DO NOT MERGE. Do not access metadatadb from main thread."
2015-03-24 18:28:53 +00:00
Dan Zivkovic
72278d3047
Change DictionaryStats to report content version.
...
Bug 19908719.
Change-Id: I5a00b5277e9cd7d964b53ff5823bada21be110fa
2015-03-24 11:19:34 -07:00
Dan Zivkovic
3b6dc20ed8
am 823aaf0f: (-s ours) am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
...
* commit '823aaf0f7d90823671fc4aabce6e56145f29921a':
Block overflow menu during setup. DO NOT MERGE
2015-03-24 03:25:17 +00:00
Chieu Nguyen
37cb7a7371
Merge "Disable Hinglish locale."
2015-03-24 01:34:02 +00:00
Chieu Nguyen
f74005d888
Remove dependency in correction settings.
...
Autocorrection and next-word suggestion are independent,
but the settings UI creates a dependency.
Bug: 19896768.
Change-Id: Ibcdd497cdfd7b9c3a69c61e0c2d116d67df84ef8
2015-03-23 18:13:03 -07:00
Chieu Nguyen
67bb8cbe61
Disable Hinglish locale.
...
Bug: 19899126.
Change-Id: I1824233b3bcb6cb6579714a7eb375ea2cebc39db
2015-03-23 18:05:04 -07:00