Bill Yi
c8de736ea2
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 7b75c5a338
2017-11-07 09:48:01 +00:00
TreeHugger Robot
7b75c5a338
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-07 09:41:30 +00:00
Bill Yi
f2b1de1435
Import translations. DO NOT MERGE am: 73120a4cdb -s ours
...
am: f74efef4fb
2017-11-07 09:35:56 +00:00
Bill Yi
f74efef4fb
Import translations. DO NOT MERGE
...
am: 73120a4cdb
2017-11-07 09:33:26 +00:00
Bill Yi
73120a4cdb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e
2017-11-06 23:21:01 -08:00
Bill Yi
80f3654189
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180
2017-11-06 23:20:38 -08:00
Erik Kline
3194e6cbb8
Merge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b
...
am: 768f467089
2017-11-07 06:08:59 +00:00
Erik Kline
768f467089
Merge "Replace dns_tls with private_dns_mode setting"
...
am: ca92fb5e2b
2017-11-07 06:00:15 +00:00
Treehugger Robot
ca92fb5e2b
Merge "Replace dns_tls with private_dns_mode setting"
2017-11-07 05:54:28 +00:00
Erik Kline
1ea5dd05c3
Replace dns_tls with private_dns_mode setting
...
Also includes:
- new layout fragment for private DNS configuration
- PrivateDnsModeDialogPreference handler class
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual interaction with private dns developer option works
Bug: 34953048
Bug: 6413396
Change-Id: I3a5490c21f7f3b3e523a247c287f213d19b75a8b
2017-11-07 12:28:48 +09:00
Fan Zhang
eb7e3e0385
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours am: ef61a45cf6 -s ours am: 5af580a419 -s ours
...
am: fbc2fd065c
2017-11-03 00:47:06 +00:00
Fan Zhang
fbc2fd065c
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours am: ef61a45cf6 -s ours
...
am: 5af580a419
2017-11-03 00:42:12 +00:00
Fan Zhang
5af580a419
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours
...
am: ef61a45cf6
2017-11-03 00:40:07 +00:00
Fan Zhang
ef61a45cf6
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours
...
am: e981e0b855
2017-11-03 00:38:04 +00:00
Fan Zhang
e981e0b855
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours
...
am: d15a81f882
2017-11-03 00:34:29 +00:00
Fan Zhang
d15a81f882
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours
...
am: 3c19043e9c
2017-11-03 00:31:01 +00:00
Fan Zhang
3c19043e9c
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours
...
am: e6a8f354fc
2017-11-03 00:28:34 +00:00
Fan Zhang
e6a8f354fc
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours
...
am: dbbcf65c96
2017-11-03 00:26:03 +00:00
Fan Zhang
dbbcf65c96
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours
...
am: 7690482014
2017-11-03 00:22:09 +00:00
Fan Zhang
7690482014
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours
...
am: 5f02135c42
2017-11-03 00:19:51 +00:00
Fan Zhang
5f02135c42
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours
...
am: 1de093b1a1
2017-11-03 00:17:43 +00:00
Fan Zhang
1de093b1a1
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours
...
am: b17703e871
2017-11-03 00:15:15 +00:00
Fan Zhang
b17703e871
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
...
am: 1c040c7414
2017-11-03 00:13:11 +00:00
Fan Zhang
1c040c7414
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
2017-11-03 00:07:32 +00:00
Fan Zhang
1aefa2529a
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Change-Id: I445cbad99344a2fcc335a5aad4a4de026ae97441
Merged-In: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Test: manual
2017-11-02 16:04:58 -07:00
Malcolm Chen
47599f8685
Merge "Updates strings for "Emergency broadcast"." am: b13f2e0fb0
...
am: 32ced85d54
2017-11-02 00:50:20 +00:00
Malcolm Chen
32ced85d54
Merge "Updates strings for "Emergency broadcast"."
...
am: b13f2e0fb0
2017-11-02 00:48:12 +00:00
Courtney Goeltzenleuchter
aba6fd61a2
Merge "Check system support of wide-color" into oc-mr1-dev
...
am: e86bc950df
2017-11-02 00:44:46 +00:00
Treehugger Robot
b13f2e0fb0
Merge "Updates strings for "Emergency broadcast"."
2017-11-02 00:42:48 +00:00
TreeHugger Robot
e86bc950df
Merge "Check system support of wide-color" into oc-mr1-dev
2017-11-02 00:40:07 +00:00
Malcolm Chen
bd124449c0
Updates strings for "Emergency broadcast".
...
Replace "Emergency broadcast" with "Emergency alerts" to be
consistent.
Test: manual
Bug: b/62291344
Change-Id: I79d6f1162d4c112dedf49a3b43ec26011adba9bf
2017-11-01 16:49:36 -07:00
Jeff Sharkey
226f795066
Merge "Change storage migration to use quota APIs." am: a0afdb0c49
...
am: 46b8d7ac78
2017-10-31 23:50:30 +00:00
Fan Zhang
45f3c5b261
Merge "Add a readme with instructions on running tests" am: 08217cbd4b
...
am: 931504bb24
2017-10-31 23:49:31 +00:00
Fan Zhang
97a271f6fb
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours am: 7da421a293 -s ours am: 76f30a360c -s ours am: 1b1204be64 -s ours
...
am: ceeb88e6a4
2017-10-31 23:22:50 +00:00
Fan Zhang
ceeb88e6a4
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours am: 7da421a293 -s ours am: 76f30a360c -s ours
...
am: 1b1204be64
2017-10-31 23:18:42 +00:00
Fan Zhang
1b1204be64
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours am: 7da421a293 -s ours
...
am: 76f30a360c
2017-10-31 23:15:37 +00:00
Fan Zhang
76f30a360c
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours
...
am: 7da421a293
2017-10-31 23:11:55 +00:00
Fan Zhang
7da421a293
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours
...
am: 9d865d0c3e
2017-10-31 23:08:25 +00:00
Fan Zhang
9d865d0c3e
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours
...
am: 3d94477fb8
2017-10-31 23:04:53 +00:00
Fan Zhang
3d94477fb8
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours
...
am: 4d9e11990d
2017-10-31 23:02:45 +00:00
Fan Zhang
4d9e11990d
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours
...
am: 0c0728a947
2017-10-31 23:00:42 +00:00
Fan Zhang
0c0728a947
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5
...
am: b4db530aa5
2017-10-31 22:59:07 +00:00
Fan Zhang
b4db530aa5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08
...
am: 769e1e31f5
2017-10-31 22:57:12 +00:00
Fan Zhang
769e1e31f5
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
...
am: cd66862b08
2017-10-31 22:54:07 +00:00
Fan Zhang
cd66862b08
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
...
am: 8bffdc2613
2017-10-31 22:50:43 +00:00
Fan Zhang
8bffdc2613
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
2017-10-31 22:47:13 +00:00
Jeff Sharkey
46b8d7ac78
Merge "Change storage migration to use quota APIs."
...
am: a0afdb0c49
2017-10-31 22:24:12 +00:00
Fan Zhang
931504bb24
Merge "Add a readme with instructions on running tests"
...
am: 08217cbd4b
2017-10-31 22:23:15 +00:00
Treehugger Robot
a0afdb0c49
Merge "Change storage migration to use quota APIs."
2017-10-31 21:47:19 +00:00
Treehugger Robot
08217cbd4b
Merge "Add a readme with instructions on running tests"
2017-10-31 21:42:28 +00:00
