OSDN Git Service
Narayan Kamath [Mon, 14 Nov 2016 13:37:08 +0000 (13:37 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247 am:
d98e75feca am:
87dc13f249 am:
c50c43667f am:
a5ff6c84a2
am:
9efaadccc0
Change-Id: I8a47806998957121f0de14e7e5bdb4d8e39944de
Narayan Kamath [Mon, 14 Nov 2016 13:36:02 +0000 (13:36 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d am:
a13068a1c8 am:
3e85db46bc
am:
5ad1a52678
Change-Id: I0e6cfed1a3fac9ba0cf45c4148fbb7fe077fd624
Narayan Kamath [Mon, 14 Nov 2016 13:35:02 +0000 (13:35 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c am:
53af5fe3f7 am:
56294db4d4
am:
8fecc8687b
Change-Id: Ie17f7a15e86b88d9fef7edc43919bc3669ba5acf
Hugo Benichi [Mon, 14 Nov 2016 13:33:55 +0000 (13:33 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce am:
4bdf37c204 am:
fd3e6e8d25
am:
bfa2fed779
Change-Id: I7c2d9158c7395a35b92ad74535cff704e6b897f4
Hugo Benichi [Mon, 14 Nov 2016 13:32:50 +0000 (13:32 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours am:
bdf4d8a93c am:
1d61b01a5d
am:
9a6f65608a
Change-Id: I91630e0cdfff69cfcea1e680fae1db34541cc8de
Narayan Kamath [Mon, 14 Nov 2016 13:27:51 +0000 (13:27 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247 am:
d98e75feca am:
87dc13f249 am:
c50c43667f
am:
a5ff6c84a2
Change-Id: I62e2180c0a3b2d9e2a11b3ad4d93288bed1ccef6
Narayan Kamath [Mon, 14 Nov 2016 13:23:48 +0000 (13:23 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d am:
a13068a1c8
am:
3e85db46bc
Change-Id: I880788deb83685b523641097bf336d3233faad96
Narayan Kamath [Mon, 14 Nov 2016 13:22:32 +0000 (13:22 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c am:
53af5fe3f7
am:
56294db4d4
Change-Id: Icc973e244e150d786c21a22ce63ae85232a115c2
Hugo Benichi [Mon, 14 Nov 2016 13:21:26 +0000 (13:21 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce am:
4bdf37c204
am:
fd3e6e8d25
Change-Id: I154015353cdab13732d82e02e277139511f797f4
Narayan Kamath [Mon, 14 Nov 2016 13:20:05 +0000 (13:20 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247 am:
d98e75feca am:
87dc13f249
am:
c50c43667f
Change-Id: I11f57941eb00efafb14e0505131e66bc22fc68c6
Hugo Benichi [Mon, 14 Nov 2016 13:19:50 +0000 (13:19 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours am:
bdf4d8a93c
am:
1d61b01a5d
Change-Id: Ie4a49408157b5de6dc0003b148e0d1042c87d515
Narayan Kamath [Mon, 14 Nov 2016 13:15:47 +0000 (13:15 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d
am:
a13068a1c8
Change-Id: I3aa51cf70829614ffcc3598e20eba6e9036d6790
Narayan Kamath [Mon, 14 Nov 2016 13:10:53 +0000 (13:10 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c
am:
53af5fe3f7
Change-Id: If824016f0535d121404b08c36b43a1ce0f168d13
Hugo Benichi [Mon, 14 Nov 2016 13:09:34 +0000 (13:09 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce
am:
4bdf37c204
Change-Id: Ida3b6e2739f273228826f1536e2573d9456c2956
Narayan Kamath [Mon, 14 Nov 2016 13:09:06 +0000 (13:09 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247 am:
d98e75feca
am:
87dc13f249
Change-Id: I7e23610ef0799dcfb3ac3598011280de22ffc25f
Hugo Benichi [Mon, 14 Nov 2016 13:08:26 +0000 (13:08 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours
am:
bdf4d8a93c
Change-Id: Ifc38d9a9e7afedd6bf5af2876f4d1dfdf430dd02
Narayan Kamath [Mon, 14 Nov 2016 13:07:49 +0000 (13:07 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b
am:
65abe1066d
Change-Id: Id11cf7f2b1dbf1db6eb047f1e2015689d733ab69
Narayan Kamath [Mon, 14 Nov 2016 12:57:59 +0000 (12:57 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b
am:
59e6dccb4c
Change-Id: I210a7f36c6bef41c62a12c0b84e3b054f7aebf99
Hugo Benichi [Mon, 14 Nov 2016 12:56:47 +0000 (12:56 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9
am:
37cacc77ce
Change-Id: I7c5bc81af38a6b6a3ea26f64ae5c1773a91f1bf6
Hugo Benichi [Mon, 14 Nov 2016 12:55:35 +0000 (12:55 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev
am:
476da32d86 -s ours
Change-Id: Ic4ff5e0c392488315659bef421535d43ac115e6f
Narayan Kamath [Mon, 14 Nov 2016 12:52:53 +0000 (12:52 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247
am:
d98e75feca
Change-Id: Ic63a80f3a591956fd82a223c74050a24d7805add
Narayan Kamath [Mon, 14 Nov 2016 12:51:41 +0000 (12:51 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7
am:
8e6e5a157b
Change-Id: Ie00c71b1bef751c2f0b039a5a150fc6971fbf415
Narayan Kamath [Mon, 14 Nov 2016 12:50:15 +0000 (12:50 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e
am:
d17867203b
Change-Id: I2d230bcbb539def3db3da59e45e0c1e86ff13a2b
Hugo Benichi [Mon, 14 Nov 2016 12:49:00 +0000 (12:49 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae
am:
afa3694ea9
Change-Id: I7ac1eb75c3bde52332875e992124407e6cfd5417
Hugo Benichi [Fri, 11 Nov 2016 02:24:23 +0000 (11:24 +0900)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev
Change-Id: I854eddda678934d0da083d22b99b855ed57fd644
TreeHugger Robot [Fri, 11 Nov 2016 23:46:26 +0000 (23:46 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev
Kevin Hufnagle [Fri, 11 Nov 2016 23:23:20 +0000 (23:23 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am:
867d09fe18
am:
5584ee2131
Change-Id: I84a7d1b5eb89fa5c796e2db7838aee0af9114486
Makoto Onuki [Fri, 11 Nov 2016 23:22:08 +0000 (23:22 +0000)]
App Shortcut: Clarify which attributes must be resources am:
104f805337
am:
2a3fe7d979
Change-Id: I7858db41a362e3be0a8668f23476b082e8140f43
Rati Agrawal [Fri, 11 Nov 2016 23:17:43 +0000 (23:17 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev
am:
87d764f184
Change-Id: I4b1424314f9b8bd1c2d463e2a3c62c90bbe107e8
Phil Weaver [Fri, 11 Nov 2016 23:17:41 +0000 (23:17 +0000)]
Add check for null manger for a11y recents action
am:
2585033100
Change-Id: I9b5977ad876048e5c527ff1f8ef6b989283a0e73
Kevin Hufnagle [Fri, 11 Nov 2016 23:14:28 +0000 (23:14 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
am:
867d09fe18
Change-Id: Ib56e1a8895557d43aadd8eada75dce2d9b836dc9
Makoto Onuki [Fri, 11 Nov 2016 23:14:22 +0000 (23:14 +0000)]
App Shortcut: Clarify which attributes must be resources
am:
104f805337
Change-Id: I85eb5652c978fe4c41059158cf1d0f180b51fdd7
Rati Agrawal [Fri, 11 Nov 2016 23:03:30 +0000 (23:03 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev
Yigit Boyar [Fri, 11 Nov 2016 22:46:32 +0000 (22:46 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev am:
7cd6c3a084
am:
4e49a3a008
Change-Id: I8b40b32c181ceab9b53e3593c11f5f716b27c1d7
Kevin Hufnagle [Fri, 11 Nov 2016 22:44:01 +0000 (22:44 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
Yigit Boyar [Fri, 11 Nov 2016 22:39:25 +0000 (22:39 +0000)]
List all methods that change data in the docs am:
42c69b9ce4
am:
7e6fdaab69
Change-Id: Ife360d719384d958b6022f29f928a5bbae2ed6ef
Yigit Boyar [Fri, 11 Nov 2016 22:31:21 +0000 (22:31 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev
am:
7cd6c3a084
Change-Id: I1eb87e80c76d7229dab716a3c3e7bf35104f59c5
Yigit Boyar [Fri, 11 Nov 2016 22:31:15 +0000 (22:31 +0000)]
List all methods that change data in the docs
am:
42c69b9ce4
Change-Id: I0808918c44981da63ace801c486d442ff1a99700
Yigit Boyar [Fri, 11 Nov 2016 22:14:11 +0000 (22:14 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev
Manu Cornet [Fri, 11 Nov 2016 19:36:08 +0000 (11:36 -0800)]
DO NOT MERGE - 2-dimensional Recents activity.
This is a simple first version in the spirit of small, incremental CLs.
It is fully functional but the following will come in later changes:
* Split screen support
* Potential animations
* Alt-tab behavior
* Relayout on orientation changes
The new activity is only started when a specific system property is set.
Test: Tested new activity behavior on local Ryu. Added tests for layout logic.
Bug:
32101881
Merged-In: I550f6e7ea0de3937dbf80e5f0294676cfe567d47
Change-Id: I46a537646e98b312d831510e1d331948888ae5ce
Bill Yi [Fri, 11 Nov 2016 19:37:55 +0000 (19:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
11ea7e4283 -s ours
Change-Id: I51ee786f03d8ad92dcfc740c5a55914bc7f16c4a
Bill Yi [Fri, 11 Nov 2016 19:37:53 +0000 (19:37 +0000)]
Import translations. DO NOT MERGE
am:
b8aaaa8949 -s ours
Change-Id: I5b120c2d816f8ba20ad443c9dbbdf5797e85923a
TreeHugger Robot [Fri, 11 Nov 2016 19:29:57 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:25:23 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
3cf37c7dc3 -s ours
Change-Id: I4593fb756b4ef79571712e707fcaeadd7da14968
Bill Yi [Fri, 11 Nov 2016 19:25:22 +0000 (19:25 +0000)]
Import translations. DO NOT MERGE
am:
e65092639f -s ours
Change-Id: I6d7024e618d7092b283d52e068d0f1a2646e8a46
Bill Yi [Fri, 11 Nov 2016 19:20:00 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d9c8da1283 -s ours
Change-Id: I9514e9874725fe1dab83d32869ea6a3ef83248f7
Bill Yi [Fri, 11 Nov 2016 19:19:59 +0000 (19:19 +0000)]
Import translations. DO NOT MERGE
am:
05a48e2a3d -s ours
Change-Id: I952a728c521909efc873b2050ffd98afc5fc4103
TreeHugger Robot [Fri, 11 Nov 2016 19:18:06 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 11 Nov 2016 19:09:35 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:03:03 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c6c0d901bf -s ours
Change-Id: I1e65c727225c0c7ff2dfa6b6c5a70b8b94290eee
Bill Yi [Fri, 11 Nov 2016 19:03:01 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am:
f5ffd25c53 -s ours
Change-Id: I775ecf81410882762047d8355d6aaea8dfff41e8
Bill Yi [Fri, 11 Nov 2016 19:01:25 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
1741524a82 -s ours
Change-Id: I2340e89591f6c4f2f11a67493dcfff9c9ff15d42
Bill Yi [Fri, 11 Nov 2016 19:01:23 +0000 (19:01 +0000)]
Import translations. DO NOT MERGE
am:
3bd78c2416 -s ours
Change-Id: I8838c95d0f6e688d70769939b2a4f5987fea5250
TreeHugger Robot [Fri, 11 Nov 2016 18:58:52 +0000 (18:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 11 Nov 2016 18:58:15 +0000 (18:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 18:56:31 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
8f278a7e06 -s ours
Change-Id: Id255f1ceb395e545f87ed91bd31f619ea9bcb06f
Bill Yi [Fri, 11 Nov 2016 18:56:29 +0000 (18:56 +0000)]
Import translations. DO NOT MERGE
am:
c51dd09193 -s ours
Change-Id: I903c542b1d66b15e87993b37afe752055fcaac5a
Bill Yi [Fri, 11 Nov 2016 18:54:53 +0000 (18:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
47e6925d54 -s ours
Change-Id: I752b035661e7457b98242313e9a55e9cc43ebf88
Bill Yi [Fri, 11 Nov 2016 18:54:51 +0000 (18:54 +0000)]
Import translations. DO NOT MERGE
am:
1b9fbcf993 -s ours
Change-Id: I62087ae560d498455ea0c50cdee622475eb31100
TreeHugger Robot [Fri, 11 Nov 2016 18:48:44 +0000 (18:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 11 Nov 2016 18:47:27 +0000 (18:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 05:16:01 +0000 (21:16 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: I9086f7b84b9bcdb6df83033e3d0fac621ec2c6e0
Bill Yi [Fri, 11 Nov 2016 05:12:09 +0000 (21:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: If37bb6852c438a2b3579f4af2045841d30be829e
Bill Yi [Fri, 11 Nov 2016 04:49:23 +0000 (20:49 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Iedf58d553e92d709ee8e7b4c7423d7e5a13a4996
Bill Yi [Fri, 11 Nov 2016 04:46:18 +0000 (20:46 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Iaad4fea006740a06defea8a03fcd070f670e331a
Bill Yi [Fri, 11 Nov 2016 04:43:06 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Iade7d25f2c66d2014fe58640bd66dc953649edf2
Bill Yi [Fri, 11 Nov 2016 04:39:44 +0000 (20:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Ib8d20a325693588125631810c810665922d4191a
Bill Yi [Fri, 11 Nov 2016 04:12:02 +0000 (20:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Ife576e74510d81bdf004e911f46d294a75aba7b5
Narayan Kamath [Fri, 11 Nov 2016 00:10:31 +0000 (00:10 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192
am:
22e45fa247
Change-Id: I70befe1803e89e9e2bbcaa70738cf53b16ec7280
Narayan Kamath [Fri, 11 Nov 2016 00:09:32 +0000 (00:09 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45
am:
a20eebfab7
Change-Id: I8a6859c90c2ce2f0ba532fd43b214d759889ae25
Narayan Kamath [Fri, 11 Nov 2016 00:04:27 +0000 (00:04 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8
am:
932cd0ed0e
Change-Id: Iadfa4ef7ca1537df9c9a0d53bb75dce0f64be567
Hugo Benichi [Fri, 11 Nov 2016 00:03:26 +0000 (00:03 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206
am:
e40917b1ae
Change-Id: I69225098ff2d75aa1a3f5245c0703c06282c7441
Narayan Kamath [Thu, 10 Nov 2016 23:58:54 +0000 (23:58 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229
am:
6bf96c1192
Change-Id: I65bc57fa4fe9fa1257ce0f4b5836616594643234
Narayan Kamath [Thu, 10 Nov 2016 23:57:55 +0000 (23:57 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78
am:
ba23956c45
Change-Id: I0b1c263050e6c15f1d6915bd86b14f257c92e9eb
Narayan Kamath [Thu, 10 Nov 2016 23:56:58 +0000 (23:56 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e
am:
d501e032d8
Change-Id: I97c4e04554c2da5bee56dc741cf71c7d2f1cba60
Hugo Benichi [Thu, 10 Nov 2016 23:55:53 +0000 (23:55 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167
am:
3d9a2d7206
Change-Id: I00250433819d7b04a101f747da100c0d13a0adcb
Hugo Benichi [Thu, 10 Nov 2016 23:55:50 +0000 (23:55 +0000)]
resolve merge conflicts of
89aa6fb to mnc-dr-dev am:
a0cfb157ec
am:
0e013c9b9f
Change-Id: Iab130296a52ba31005344793ed07c22003ac729f
Alain Vongsouvanh [Thu, 10 Nov 2016 23:55:48 +0000 (23:55 +0000)]
colors: add missing accent_material_{700,50} resources.
am:
fade1235e5
Change-Id: I8d1863ef7803f92ddc4ffe41b02474f0468c88c6
Hugo Benichi [Thu, 10 Nov 2016 23:46:53 +0000 (23:46 +0000)]
resolve merge conflicts of
89aa6fb to mnc-dr-dev
am:
a0cfb157ec
Change-Id: I10ee0e4e8ef8a1785a16f6f83b8bb38b8847e85a
Narayan Kamath [Thu, 10 Nov 2016 23:40:36 +0000 (23:40 +0000)]
Zygote: Additional whitelisting for legacy devices.
am:
5e2f7c6229
Change-Id: I36adcd8393eab2bb4421f9e3e72302c5db37422a
Narayan Kamath [Thu, 10 Nov 2016 23:39:07 +0000 (23:39 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev
am:
b3b03a9d78
Change-Id: Iafd7fc34df0fb88710003ea94219301d77ca78ed
Narayan Kamath [Thu, 10 Nov 2016 23:39:03 +0000 (23:39 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
4e8ba1d73e
Change-Id: I52347c0024cc230d6e3db739eaafd78989c18430
Hugo Benichi [Thu, 10 Nov 2016 23:37:51 +0000 (23:37 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev
am:
fce4e43167
Change-Id: I9bf79e439213358381668b8c15d2d3061fa1170d
Alain Vongsouvanh [Thu, 10 Nov 2016 21:18:35 +0000 (13:18 -0800)]
colors: add missing accent_material_{700,50} resources.
Those two resources were only defined for watches and had no default
counterparts.
BUG:
32786346
Change-Id: I0868d34d1df55c6dfd26d13c3a7d468866603a97
Chris Elliott [Thu, 10 Nov 2016 18:50:28 +0000 (18:50 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours am:
69246f0565 -s ours am:
a8a116b001 -s ours am:
8409d50122 -s ours
am:
c07d8aa52d -s ours
Change-Id: If5a7680ee9de27107bf32138e91f2eb705181ab0
Hugo Benichi [Thu, 10 Nov 2016 18:49:18 +0000 (18:49 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours am:
69d565b12d -s ours am:
37779485b7 -s ours am:
986c684fb0 -s ours
am:
5c10f1e552 -s ours
Change-Id: I9bf86e8adf3a2d6efbce54e3fc6a59ee650daaef
Chris Elliott [Thu, 10 Nov 2016 18:44:06 +0000 (18:44 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours am:
69246f0565 -s ours am:
a8a116b001 -s ours
am:
8409d50122 -s ours
Change-Id: I31d22a167ee7de857ed0403b2d14daa1d90055f0
Hugo Benichi [Thu, 10 Nov 2016 18:42:57 +0000 (18:42 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours am:
69d565b12d -s ours am:
37779485b7 -s ours
am:
986c684fb0 -s ours
Change-Id: I5bb53669285c0878905f8a2a70ff2dbe06c09ab2
Chris Elliott [Thu, 10 Nov 2016 18:37:44 +0000 (18:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours am:
69246f0565 -s ours
am:
a8a116b001 -s ours
Change-Id: I02d089dca4dd0ee9808f77dce0957b1cfaf6c87d
Hugo Benichi [Thu, 10 Nov 2016 18:36:30 +0000 (18:36 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours am:
69d565b12d -s ours
am:
37779485b7 -s ours
Change-Id: I42aabc35fa30e242125015eac1b7d32790cc4528
Chris Elliott [Thu, 10 Nov 2016 18:25:11 +0000 (18:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours
am:
69246f0565 -s ours
Change-Id: I8181f07829ea7e77986a0f4537a61e4060c1176e
Hugo Benichi [Thu, 10 Nov 2016 18:23:58 +0000 (18:23 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours
am:
69d565b12d -s ours
Change-Id: Ibe074076d22a736394a01d27aa9e1c7ed73458b2
Chris Elliott [Thu, 10 Nov 2016 18:12:17 +0000 (18:12 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours
am:
0e11e0d961 -s ours
Change-Id: I800746b8b1fc8e63eb78a83632d9eaac9abebcd2
Hugo Benichi [Thu, 10 Nov 2016 18:11:02 +0000 (18:11 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours
am:
da695f5fdb -s ours
Change-Id: If1903ace2a31d8ccf3c66916211a07ac342fc360
Chris Elliott [Thu, 10 Nov 2016 18:04:28 +0000 (18:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
am:
06a55fb553 -s ours
Change-Id: I3e0facc6ff6dff0109452fe36f89a4eefe7676e1
Hugo Benichi [Thu, 10 Nov 2016 18:04:26 +0000 (18:04 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
am:
f88508bd3e -s ours
Change-Id: I2ba3b591df623298f41e92e6f0d067a6fcf30533
Chris Elliott [Thu, 10 Nov 2016 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
Bill Yi [Thu, 10 Nov 2016 14:25:20 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e231af6c88 -s ours
Change-Id: I85b530c1946c4d2da5a4fefb6b343edb75b57697
Bill Yi [Thu, 10 Nov 2016 14:25:17 +0000 (14:25 +0000)]
Import translations. DO NOT MERGE
am:
377d4af0d0 -s ours
Change-Id: Ia88f3c49ca604ef7493bf493ca63becc0a20eb53
Bill Yi [Thu, 10 Nov 2016 14:23:45 +0000 (14:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0bf8ae56ff -s ours
Change-Id: I896a62c6c88343eeba13406ce3ce71e576899762