Bill Yi
7a7f0f2fb8
Import translations. DO NOT MERGE
...
Change-Id: Ia01af8ad2ea779f6d2546cd2f551169b42ab43ea
Auto-generated-cl: translation import
2016-06-14 02:33:20 -07:00
Robert Greenwalt
1bd411f64a
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp am: 89b8babe6a
...
am: 69118dc9b1
2016-06-13 20:14:29 +00:00
宋凯伦
69118dc9b1
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
...
am: 89b8babe6a
2016-06-13 20:10:42 +00:00
Robert Greenwalt
89b8babe6a
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
...
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
2016-06-13 13:01:36 -07:00
宋凯伦
b34cf8647f
Merge \"Fix the memory leak in TetherSettings\"
...
am: 03393c4109
2016-06-13 18:46:19 +00:00
Robert Greenwalt
03393c4109
Merge "Fix the memory leak in TetherSettings"
2016-06-13 18:35:32 +00:00
Michal Karpinski
415da00e36
Merge \"Merge \\\"Remove \\\'You can choose to either trust or remove this certificate\\\' from Check certificate dialog\\\" into nyc-dev am: 86c9894f04 am: b57c55d42c\" into nyc-mr1-dev-plus-aosp
...
am: fe91143d71
2016-06-13 17:52:25 +00:00
Michal Karpinski
24fc55bf27
Merge \\\"Remove \\\'You can choose to either trust or remove this certificate\\\' from Check certificate dialog\\\" into nyc-dev am: 86c9894f04 am: 8532049946
...
am: c0832141a0
2016-06-13 17:52:25 +00:00
Android Build Merger (Role)
fe91143d71
Merge "Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04 am: b57c55d42c" into nyc-mr1-dev-plus-aosp
2016-06-13 17:44:32 +00:00
Michal Karpinski
5b57a8991c
Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04
...
am: b57c55d42c
2016-06-13 17:44:24 +00:00
Michal Karpinski
c0832141a0
Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04
...
am: 8532049946
2016-06-13 17:44:09 +00:00
Michal Karpinski
b57c55d42c
Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
...
am: 86c9894f04
2016-06-13 17:40:13 +00:00
Michal Karpinski
8532049946
Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
...
am: 86c9894f04
2016-06-13 17:40:12 +00:00
TreeHugger Robot
86c9894f04
Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev
2016-06-13 17:29:22 +00:00
Robin Lee
65c8dd536b
Merge \"Merge \\\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\\" into nyc-dev am: cab4f9dc39 am: 442498681d\" into nyc-mr1-dev-plus-aosp
...
am: 14cc0fd5a3
2016-06-13 16:23:02 +00:00
Robin Lee
a649206c19
Merge \\\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\\" into nyc-dev am: cab4f9dc39 am: c7f0f2338a
...
am: b5b2fd5204
2016-06-13 16:23:01 +00:00
Android Build Merger (Role)
14cc0fd5a3
Merge "Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am: cab4f9dc39 am: 442498681d" into nyc-mr1-dev-plus-aosp
2016-06-13 16:19:21 +00:00
Robin Lee
f11141c0cd
Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am: cab4f9dc39
...
am: 442498681d
2016-06-13 16:19:13 +00:00
Robin Lee
b5b2fd5204
Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am: cab4f9dc39
...
am: c7f0f2338a
2016-06-13 16:19:10 +00:00
Robin Lee
442498681d
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
...
am: cab4f9dc39
2016-06-13 16:15:20 +00:00
Robin Lee
c7f0f2338a
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
...
am: cab4f9dc39
2016-06-13 16:15:19 +00:00
Robin Lee
cab4f9dc39
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev
2016-06-13 16:03:54 +00:00
Michal Karpinski
5666e5556f
Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog
...
Removing because user might not be able to remove (because the option is disallowed).
Bug: 29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836
2016-06-13 16:52:58 +01:00
Robin Lee
49be1c1b06
Respect DISALLOW_CONFIG_VPN for disconnect dialog
...
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix: 29265163
2016-06-13 15:08:32 +00:00
Nicolas Prévot
e000022872
Merge \"Merge \\\"Fix rendering of policy transparency activity.\\\" into nyc-dev am: 98704bc495 am: 1ba2cbbfc2\" into nyc-mr1-dev-plus-aosp
...
am: a48e7e767b
2016-06-13 12:58:28 +00:00
Nicolas Prevot
7f8c6354ac
Merge \\\"Fix rendering of policy transparency activity.\\\" into nyc-dev am: 98704bc495 am: 341b21d2f8
...
am: 21693422b4
2016-06-13 12:58:28 +00:00
Android Build Merger (Role)
a48e7e767b
Merge "Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495 am: 1ba2cbbfc2" into nyc-mr1-dev-plus-aosp
2016-06-13 12:54:55 +00:00
Nicolas Prévot
88555d92ee
Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495
...
am: 1ba2cbbfc2
2016-06-13 12:54:43 +00:00
Nicolas Prévot
21693422b4
Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495
...
am: 341b21d2f8
2016-06-13 12:54:36 +00:00
Nicolas Prevot
341b21d2f8
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
...
am: 98704bc495
2016-06-13 12:50:16 +00:00
Nicolas Prevot
1ba2cbbfc2
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
...
am: 98704bc495
2016-06-13 12:50:11 +00:00
Nicolas Prévot
98704bc495
Merge "Fix rendering of policy transparency activity." into nyc-dev
2016-06-13 12:37:05 +00:00
Ruchi Kandoi
5c1a19c573
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp am: f8c135a986
...
am: 2fda09ad85
2016-06-11 05:22:06 +00:00
Mark Salyzyn
2fda09ad85
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
am: f8c135a986
2016-06-11 05:18:20 +00:00
Ruchi Kandoi
f8c135a986
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
2016-06-10 22:04:52 -07:00
Bill Yi
edeca513bc
Import translations. DO NOT MERGE am: c66bffa31f -s ours am: 099609af97 -s ours
...
am: c7e9bfd2b8
2016-06-11 04:51:33 +00:00
Bill Yi
87d06026d8
Import translations. DO NOT MERGE am: c66bffa31f -s ours am: b99a48f779 -s ours
...
am: 6cffc3f8ba
2016-06-11 04:47:46 +00:00
Bill Yi
c7e9bfd2b8
Import translations. DO NOT MERGE am: c66bffa31f -s ours
...
am: 099609af97
2016-06-11 04:47:45 +00:00
Bill Yi
6cffc3f8ba
Import translations. DO NOT MERGE am: c66bffa31f -s ours
...
am: b99a48f779
2016-06-11 04:44:01 +00:00
Bill Yi
b99a48f779
Import translations. DO NOT MERGE
...
am: c66bffa31f
2016-06-11 04:40:07 +00:00
Bill Yi
099609af97
Import translations. DO NOT MERGE
...
am: c66bffa31f
2016-06-11 04:40:07 +00:00
Mark Salyzyn
9e28f9a7f7
Merge \"Settings: add logpersist selection (actions)\"
...
am: 3c398ea710
2016-06-10 22:50:23 +00:00
Treehugger Robot
3c398ea710
Merge "Settings: add logpersist selection (actions)"
2016-06-10 22:37:55 +00:00
Mark Salyzyn
03af2286ee
Settings: add logpersist selection (actions)
...
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
2016-06-10 21:44:32 +00:00
Bill Yi
c66bffa31f
Import translations. DO NOT MERGE
...
Change-Id: I1e7bce31415e722131d6127fc7534669ce527d37
Auto-generated-cl: translation import
2016-06-10 13:49:23 -07:00
Meng Wang
95dd0323a6
Merge \\"Wi-Fi Calling settings UI update\\" into nyc-mr1-dev am: 7648de1ec6
...
am: 9b345526b7
2016-06-10 16:44:28 +00:00
Meng Wang
9b345526b7
Merge \"Wi-Fi Calling settings UI update\" into nyc-mr1-dev
...
am: 7648de1ec6
2016-06-10 16:42:25 +00:00
Meng Wang
7648de1ec6
Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev
2016-06-10 16:36:46 +00:00
Jason Monk
47fb7da7e1
Merge \\\"Fix crash in finish from onCreate.\\\" into nyc-dev am: 1a1f6b0b1b am: 3078e76284
...
am: 36045d1e9c
2016-06-10 15:17:21 +00:00
Jason Monk
2f40b22d41
Merge \\\"Fix crash in finish from onCreate.\\\" into nyc-dev am: 1a1f6b0b1b am: 0fa8dc1b55
...
am: 4d86173586
2016-06-10 15:17:20 +00:00
