Bill Yi
9d6ff72884
Import translations. DO NOT MERGE
...
am: 377d4af0d0
2016-11-10 14:25:17 +00:00
Bill Yi
221c05e6d1
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 0bf8ae56ff
2016-11-10 14:23:45 +00:00
Bill Yi
35b2ed41ce
Import translations. DO NOT MERGE
...
am: 37fa5cbc28
2016-11-10 14:23:42 +00:00
Bill Yi
0bf8ae56ff
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-11-10 14:13:47 +00:00
Narayan Kamath
532d73cf8c
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am: a67112ca92 am: c0df29dfbc am: e9a12d0ac7
...
am: f0a65b9a98
2016-11-10 10:35:03 +00:00
Narayan Kamath
847d4476a7
Zygote : Block SIGCHLD during fork. am: dfcc79ee8e am: 720fcbc1f7 am: c82eb23651
...
am: b0c09c0ebe
2016-11-10 10:33:57 +00:00
Narayan Kamath
f0a65b9a98
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am: a67112ca92 am: c0df29dfbc
...
am: e9a12d0ac7
2016-11-10 10:29:02 +00:00
Narayan Kamath
b0c09c0ebe
Zygote : Block SIGCHLD during fork. am: dfcc79ee8e am: 720fcbc1f7
...
am: c82eb23651
2016-11-10 10:27:58 +00:00
Bill Yi
377d4af0d0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32766034
Change-Id: I7d27891f4b452f54e6f14d22f37b6b2bcbdefc5b
2016-11-10 02:24:31 -08:00
Narayan Kamath
e9a12d0ac7
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am: a67112ca92
...
am: c0df29dfbc
2016-11-10 10:23:00 +00:00
Narayan Kamath
c82eb23651
Zygote : Block SIGCHLD during fork. am: dfcc79ee8e
...
am: 720fcbc1f7
2016-11-10 10:21:57 +00:00
Narayan Kamath
c0df29dfbc
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
...
am: a67112ca92
2016-11-10 10:15:59 +00:00
Narayan Kamath
720fcbc1f7
Zygote : Block SIGCHLD during fork.
...
am: dfcc79ee8e
2016-11-10 10:15:56 +00:00
Bill Yi
37fa5cbc28
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32766034
Change-Id: I3116c8192dcb7e203d6551eaa50e6faf4220cd0e
2016-11-10 02:13:53 -08:00
Narayan Kamath
a67112ca92
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
2016-11-10 10:04:13 +00:00
Alain Vongsouvanh
e616fa1789
colors: Properly set the default accent colors.
...
am: 7b371575e4
2016-11-10 02:40:55 +00:00
Alain Vongsouvanh
7b371575e4
colors: Properly set the default accent colors.
...
The 700 and 50 variant of the default accent colors were pointing to the
wrong material resources (deep_teal instead of accent).
This CL also update the watch colors to the proper specs.
BUG: 32087183
Change-Id: Ib8a23d9078e79bc0fdf6da893b4dff12954c2cbb
2016-11-10 01:14:55 +00:00
TreeHugger Robot
6a6bc370e9
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
2016-11-09 23:05:43 +00:00
Xin Li
a29c7c77b1
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f am: 0326b807fa
...
am: d478287ab9
2016-11-09 21:14:56 +00:00
Xin Li
a009932a57
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520 am: 4c1922b441
...
am: ba293f3c28
2016-11-09 21:13:43 +00:00
Xin Li
d478287ab9
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f
...
am: 0326b807fa
2016-11-09 21:03:17 +00:00
Xin Li
ba293f3c28
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520
...
am: 4c1922b441
2016-11-09 21:02:08 +00:00
Xin Li
0326b807fa
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69
...
am: 0bf282606f
2016-11-09 20:52:19 +00:00
Xin Li
4c1922b441
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f
...
am: 892385f520
2016-11-09 20:51:08 +00:00
Narayan Kamath
2b3a352a4d
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa am: e3d31ebc0e
...
am: dac1d242ab
2016-11-09 20:49:08 +00:00
Narayan Kamath
c8044be01e
Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f am: 76a388b93b -s ours
...
am: 30a6da2b14
2016-11-09 20:47:09 +00:00
Xin Li
b7f279051e
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426
...
am: c8ac64aca7
2016-11-09 20:46:08 +00:00
Xin Li
0bf282606f
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours
...
am: 4146229e69
2016-11-09 20:45:40 +00:00
Xin Li
3b4f8bc034
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8
...
am: 68d354abce
2016-11-09 20:45:14 +00:00
Xin Li
892385f520
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours
...
am: d167a27c1f
2016-11-09 20:44:35 +00:00
Narayan Kamath
dac1d242ab
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa
...
am: e3d31ebc0e
2016-11-09 20:41:16 +00:00
Narayan Kamath
30a6da2b14
Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f
...
am: 76a388b93b
2016-11-09 20:40:24 +00:00
Xin Li
4146229e69
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058
...
am: 503661118a
2016-11-09 20:36:11 +00:00
Xin Li
c8ac64aca7
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac
...
am: 781d8f7426
2016-11-09 20:35:03 +00:00
Xin Li
d167a27c1f
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2
...
am: 84a9614947
2016-11-09 20:34:42 +00:00
Xin Li
68d354abce
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081
...
am: 9dccfbc7c8
2016-11-09 20:34:01 +00:00
Narayan Kamath
e3d31ebc0e
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf
...
am: acdb6bb1aa
2016-11-09 20:26:18 +00:00
Narayan Kamath
76a388b93b
Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69
...
am: 4f65baa12f
2016-11-09 20:25:13 +00:00
Xin Li
503661118a
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e
...
am: 71e62a4058
2016-11-09 20:24:23 +00:00
Xin Li
781d8f7426
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630
...
am: 1a06ebfcac
2016-11-09 20:24:23 +00:00
Xin Li
9dccfbc7c8
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours
...
am: b9634f3081
2016-11-09 20:23:02 +00:00
Xin Li
84a9614947
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba
...
am: 63c9a312a2
2016-11-09 20:23:01 +00:00
Xin Li
71e62a4058
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931
...
am: eda0b0078e
2016-11-09 20:17:53 +00:00
Xin Li
63c9a312a2
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours
...
am: 6166af96ba
2016-11-09 20:17:00 +00:00
Narayan Kamath
acdb6bb1aa
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev
...
am: 12f98789bf
2016-11-09 20:13:19 +00:00
Narayan Kamath
4f65baa12f
Zygote: Additional whitelists for runtime overlay / other static resources.
...
am: 25cd01cc69
2016-11-09 20:13:16 +00:00
Xin Li
1a06ebfcac
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
...
am: 49b144e630
2016-11-09 20:11:43 +00:00
Xin Li
eda0b0078e
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
...
am: cc115c5931
2016-11-09 20:11:42 +00:00
Xin Li
b9634f3081
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev.
...
am: 9b9906e9c0
2016-11-09 20:11:38 +00:00
Xin Li
6166af96ba
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev.
...
am: ee2903686f
2016-11-09 20:11:37 +00:00
