Geoff Mendal
f999d57278
am c123f953
: (-s ours) am 4accfd0b
: (-s ours) am 1bd19dd1
: (-s ours) am 0e3ffe7c
: (-s ours) am 5fa0a93d
: (-s ours) am 4fedc0fd
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c123f953007aefb7297b399eb03397d1a7406593':
Import translations. DO NOT MERGE
2015-10-12 13:17:48 +00:00
Geoff Mendal
c123f95300
am 4accfd0b
: (-s ours) am 1bd19dd1
: (-s ours) am 0e3ffe7c
: (-s ours) am 5fa0a93d
: (-s ours) am 4fedc0fd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4accfd0b121d2b258bca301b16f62c1ac760d89c':
Import translations. DO NOT MERGE
2015-10-12 13:14:14 +00:00
Geoff Mendal
4accfd0b12
am 1bd19dd1
: (-s ours) am 0e3ffe7c
: (-s ours) am 5fa0a93d
: (-s ours) am 4fedc0fd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1bd19dd17e2038df6c374ca6ed48498de4dde730':
Import translations. DO NOT MERGE
2015-10-12 13:11:42 +00:00
Geoff Mendal
1bd19dd17e
am 0e3ffe7c
: (-s ours) am 5fa0a93d
: (-s ours) am 4fedc0fd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0e3ffe7cce1ceeac9eeac839d41db40ba983f97d':
Import translations. DO NOT MERGE
2015-10-12 13:04:48 +00:00
Geoff Mendal
0e3ffe7cce
am 5fa0a93d
: (-s ours) am 4fedc0fd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
Import translations. DO NOT MERGE
2015-10-12 13:00:56 +00:00
Geoff Mendal
5fa0a93d3e
am 4fedc0fd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
Import translations. DO NOT MERGE
2015-10-12 12:55:33 +00:00
Geoff Mendal
61a490837c
am 30d1619a
: (-s ours) am c483a5e3
: (-s ours) am 5a761be3
: (-s ours) am 7d521a8f
: (-s ours) am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '30d1619a4472537317eb99a46c6ef3eb08e6c225':
Import translations. DO NOT MERGE
2015-10-12 12:52:36 +00:00
Geoff Mendal
30d1619a44
am c483a5e3
: (-s ours) am 5a761be3
: (-s ours) am 7d521a8f
: (-s ours) am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c483a5e3fc3377c5ea3535e908c60ba1ac901936':
Import translations. DO NOT MERGE
2015-10-12 12:47:52 +00:00
Geoff Mendal
c483a5e3fc
am 5a761be3
: (-s ours) am 7d521a8f
: (-s ours) am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5a761be3dd72b5a318f9387d104f7010b327bfec':
Import translations. DO NOT MERGE
2015-10-12 12:43:04 +00:00
Geoff Mendal
5a761be3dd
am 7d521a8f
: (-s ours) am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7d521a8ff28ac8bc6110bc6eaff38c58bb792ca0':
Import translations. DO NOT MERGE
2015-10-12 12:37:43 +00:00
Geoff Mendal
4fedc0fdaf
Import translations. DO NOT MERGE
...
Change-Id: Ia5044b8f155b8256dedc8581f8c7147ffdd0d2bc
Auto-generated-cl: translation import
2015-10-12 05:34:25 -07:00
Geoff Mendal
7d521a8ff2
am f598d0bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f598d0bcf70e27a14462bc5403c83822c5600945':
Import translations. DO NOT MERGE
2015-10-12 12:30:37 +00:00
Geoff Mendal
f598d0bcf7
Import translations. DO NOT MERGE
...
Change-Id: I0eb630b2b5dec19d48787ff56367a3f05b41483a
Auto-generated-cl: translation import
2015-10-12 05:21:40 -07:00
Christopher Tate
02858cc0c6
resolved conflicts for 192248cc
to master
...
Change-Id: I636e9c78445c3bbd8b290ec0601a45d68b36a06d
2015-10-09 17:49:13 -07:00
Christopher Tate
192248cc9a
am eba9ff7c
: am 78f7fa0f
: am 90de3beb
: Disable app-link preferences for browser apps
...
* commit 'eba9ff7c64767ba903a424adf6c74844317908cb':
Disable app-link preferences for browser apps
2015-10-10 00:14:12 +00:00
Christopher Tate
eba9ff7c64
am 78f7fa0f
: am 90de3beb
: Disable app-link preferences for browser apps
...
* commit '78f7fa0fc8ed3ede373cdb42e2af2046c87ac470':
Disable app-link preferences for browser apps
2015-10-10 00:09:02 +00:00
Christopher Tate
78f7fa0fc8
am 90de3beb
: Disable app-link preferences for browser apps
...
* commit '90de3bebf432d0897607adaca281fe248cd6575f':
Disable app-link preferences for browser apps
2015-10-09 23:57:48 +00:00
Christopher Tate
90de3bebf4
Disable app-link preferences for browser apps
...
Also make sure that the 'Clear defaults' action unsets the app's
standing as the default browser, when applicable.
Bug 23751034
Change-Id: I6131b763bfa76ba38d18cad2abbb35caffe789aa
2015-10-09 16:02:00 -07:00
Tony Mantler
bff7116ff0
Move DreamBackend to SettingsLib
...
Change-Id: Ia3f3f68e7182c74f4db6e00635fa0c928032a8fc
2015-10-09 14:37:16 -07:00
Toni Barzic
18727d5cf2
Fix plurals messages for autoclick delay strings
...
Add missing one quantities
BUG=24810663
Change-Id: I6ecb9d4bf1cadb1b64ff247ed97eac8d467fb612
2015-10-09 14:01:30 -07:00
Julia Reynolds
3ef3ad6b73
Merge "Use id-based zen rule APIs."
2015-10-08 22:27:01 +00:00
Amit Mahajan
5787be339f
Change to add user_visible field to Carriers table.
...
Also adding config to control if adding APNs is allowed.
Bug: 24519879
Bug: 24681288
Change-Id: I59466f5489606162a10e883ede378e575a189fb3
2015-10-08 10:36:03 -07:00
Julia Reynolds
25cb8f0691
Use id-based zen rule APIs.
...
Also names no longer have to be unique.
Bug: 22977552
Change-Id: I8dbee85c15d12d5380345447047a0d49c903522e
2015-10-08 13:07:07 -04:00
Toni Barzic
496f099752
Merge "Add a11y setting for Automatically click after pointer stops"
2015-10-07 18:25:09 +00:00
Wale Ogunwale
f541d95f92
Merge "Revert "Added Developer Options settings for multi-window mode.""
2015-10-07 17:35:32 +00:00
Wale Ogunwale
b4d7efbfa2
Revert "Added Developer Options settings for multi-window mode."
...
This reverts commit 4c9d667bc2
.
Bug: 24462906
Bug: 19494313
Change-Id: Iaa698868d8896a09c377b5da03c20b2a0b72d253
2015-10-07 09:24:23 -07:00
Geoff Mendal
0917fa2ed1
am 33ead118
: (-s ours) am 55d7bf4f
: (-s ours) am 32f4b469
: (-s ours) am 47e870ad
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '33ead118a81cbb505161e8a81af2bdff578c7620':
Import translations. DO NOT MERGE
2015-10-07 16:04:56 +00:00
Geoff Mendal
33ead118a8
am 55d7bf4f
: (-s ours) am 32f4b469
: (-s ours) am 47e870ad
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '55d7bf4f5cb26c4f26c3ac6cbad0b8ca3c0ad579':
Import translations. DO NOT MERGE
2015-10-07 15:59:51 +00:00
Geoff Mendal
55d7bf4f5c
am 32f4b469
: (-s ours) am 47e870ad
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '32f4b4690ee39986595ad0803070f112e06203ef':
Import translations. DO NOT MERGE
2015-10-07 15:55:23 +00:00
Geoff Mendal
32f4b4690e
am 47e870ad
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '47e870adc8df32c2a6e2c531be115dd0b698850e':
Import translations. DO NOT MERGE
2015-10-07 15:50:10 +00:00
Geoff Mendal
47e870adc8
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-10-07 15:45:36 +00:00
Geoff Mendal
7d0343ae39
Import translations. DO NOT MERGE
...
Change-Id: I3b42883202e9bc41fcd5b4bcc844db53e7ee6efd
Auto-generated-cl: translation import
2015-10-07 07:44:44 -07:00
Geoff Mendal
f7f92b1a98
Merge "Import translations. DO NOT MERGE"
2015-10-07 13:53:36 +00:00
Geoff Mendal
f01605d66f
Import translations. DO NOT MERGE
...
Change-Id: Ic7120928ef45569613e7d5f56b29ad09ca474f36
Auto-generated-cl: translation import
2015-10-07 06:53:12 -07:00
Geoff Mendal
2c0cc6d34b
am e3cfc50c
: (-s ours) am b224ec18
: (-s ours) am fd9b7cf0
: (-s ours) am e3d8faa5
: (-s ours) am 4f7f05a0
: (-s ours) am ad36aa0e
: (-s ours) am 3963b980
: (-s ours) am 793b2a2d
: (-s ours) am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e3cfc50cb04c8965c9f286e874ec6d2f4f446e03':
Import translations. DO NOT MERGE
2015-10-07 13:28:57 +00:00
Geoff Mendal
e3cfc50cb0
am b224ec18
: (-s ours) am fd9b7cf0
: (-s ours) am e3d8faa5
: (-s ours) am 4f7f05a0
: (-s ours) am ad36aa0e
: (-s ours) am 3963b980
: (-s ours) am 793b2a2d
: (-s ours) am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b224ec187db4f065bc8f4015eadfef10deba0e73':
Import translations. DO NOT MERGE
2015-10-07 13:22:36 +00:00
Geoff Mendal
b224ec187d
am fd9b7cf0
: (-s ours) am e3d8faa5
: (-s ours) am 4f7f05a0
: (-s ours) am ad36aa0e
: (-s ours) am 3963b980
: (-s ours) am 793b2a2d
: (-s ours) am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fd9b7cf03c4454df8ddf166eb37fa5370d28125b':
Import translations. DO NOT MERGE
2015-10-07 13:18:40 +00:00
Geoff Mendal
fd9b7cf03c
am e3d8faa5
: (-s ours) am 4f7f05a0
: (-s ours) am ad36aa0e
: (-s ours) am 3963b980
: (-s ours) am 793b2a2d
: (-s ours) am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e3d8faa5ba76f79b112dd8925189455e878e3a66':
Import translations. DO NOT MERGE
2015-10-07 13:13:34 +00:00
Geoff Mendal
e3d8faa5ba
am 4f7f05a0
: (-s ours) am ad36aa0e
: (-s ours) am 3963b980
: (-s ours) am 793b2a2d
: (-s ours) am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4f7f05a00bf1b909140119884b65373b6248c0db':
Import translations. DO NOT MERGE
2015-10-07 13:07:48 +00:00
Geoff Mendal
e864ebe1f9
am 8527762a
: (-s ours) am c5f66d7e
: (-s ours) am 5e183ac6
: (-s ours) am bd64cd59
: (-s ours) am 35d2cf1c
: (-s ours) am b4a027d0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8527762af63566c75d955a8d8bb1f8c3ead442af':
Import translations. DO NOT MERGE
2015-10-07 13:07:39 +00:00
Geoff Mendal
4f7f05a00b
am ad36aa0e
: (-s ours) am 3963b980
: (-s ours) am 793b2a2d
: (-s ours) am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ad36aa0ed1b7ba2541d28bc447473e27f3d04e22':
Import translations. DO NOT MERGE
2015-10-07 13:01:25 +00:00
Geoff Mendal
8527762af6
am c5f66d7e
: (-s ours) am 5e183ac6
: (-s ours) am bd64cd59
: (-s ours) am 35d2cf1c
: (-s ours) am b4a027d0
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c5f66d7e8488b6c5a46e2600ae399a898cd67945':
Import translations. DO NOT MERGE
2015-10-07 13:00:53 +00:00
Geoff Mendal
c5f66d7e84
am 5e183ac6
: (-s ours) am bd64cd59
: (-s ours) am 35d2cf1c
: (-s ours) am b4a027d0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5e183ac6608eb5aca32a2a2835cd321217b451fb':
Import translations. DO NOT MERGE
2015-10-07 12:56:58 +00:00
Geoff Mendal
ad36aa0ed1
am 3963b980
: (-s ours) am 793b2a2d
: (-s ours) am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3963b980bebacb58dd2ed57fd45b042a01f125a0':
Import translations. DO NOT MERGE
2015-10-07 12:56:45 +00:00
Geoff Mendal
5e183ac660
am bd64cd59
: (-s ours) am 35d2cf1c
: (-s ours) am b4a027d0
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bd64cd59d6aace965dec9896a545572e16b456d6':
Import translations. DO NOT MERGE
2015-10-07 12:51:52 +00:00
Geoff Mendal
3963b980be
am 793b2a2d
: (-s ours) am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '793b2a2d444192ee587a643c88e535ebf0c98158':
Import translations. DO NOT MERGE
2015-10-07 12:51:18 +00:00
Geoff Mendal
793b2a2d44
am d4fd061d
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd4fd061d6e33abb96dd8a6cac2d14cdbca154ce9':
Import translations. DO NOT MERGE
2015-10-07 12:46:38 +00:00
Geoff Mendal
bd64cd59d6
am 35d2cf1c
: (-s ours) am b4a027d0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '35d2cf1c0c75342b307fa90f1508741b10169c9f':
Import translations. DO NOT MERGE
2015-10-07 12:46:25 +00:00
Geoff Mendal
35d2cf1c0c
am b4a027d0
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b4a027d07bdd6b488a0ca576f7369beb0cad17c6':
Import translations. DO NOT MERGE
2015-10-07 12:41:35 +00:00
Geoff Mendal
d4fd061d6e
Import translations. DO NOT MERGE
...
Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import
2015-10-07 05:36:18 -07:00