OSDN Git Service
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
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
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
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
Bill Yi [Thu, 10 Nov 2016 14:23:42 +0000 (14:23 +0000)]
Import translations. DO NOT MERGE
am:
37fa5cbc28 -s ours
Change-Id: I07c9584f08f6609f55a0af74fc5259f90fdb3285
Bill Yi [Thu, 10 Nov 2016 14:14:39 +0000 (14:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 10 Nov 2016 14:13:43 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Narayan Kamath [Thu, 10 Nov 2016 10:35:03 +0000 (10:35 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc am:
e9a12d0ac7
am:
f0a65b9a98
Change-Id: I0d5469927688fa23290f3b3e136ba50820b0b8d9
Narayan Kamath [Thu, 10 Nov 2016 10:33:57 +0000 (10:33 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7 am:
c82eb23651
am:
b0c09c0ebe
Change-Id: I1c378d684eb07cd20b64b358770fa6fe1dae274c
Narayan Kamath [Thu, 10 Nov 2016 10:29:02 +0000 (10:29 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc
am:
e9a12d0ac7
Change-Id: I9c34dfaf3e2cdbb2560765002926a493d2651708
Narayan Kamath [Thu, 10 Nov 2016 10:27:58 +0000 (10:27 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7
am:
c82eb23651
Change-Id: Iec1e60c29bcaedf030da989aa66488bd87206563
Bill Yi [Thu, 10 Nov 2016 10:24:31 +0000 (02:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: I7d27891f4b452f54e6f14d22f37b6b2bcbdefc5b
Narayan Kamath [Thu, 10 Nov 2016 10:23:00 +0000 (10:23 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92
am:
c0df29dfbc
Change-Id: I5a77286ff7758d3c7aaa1a2bd14588e8dd5216d5
Narayan Kamath [Thu, 10 Nov 2016 10:21:57 +0000 (10:21 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e
am:
720fcbc1f7
Change-Id: I18aeb47e1a4f061d5afe55a2aa936ae1d1cc61ff
Narayan Kamath [Thu, 10 Nov 2016 10:15:59 +0000 (10:15 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
am:
a67112ca92
Change-Id: Ib8bef283e74694a415dc73f2c16b4de3b201798e
Narayan Kamath [Thu, 10 Nov 2016 10:15:56 +0000 (10:15 +0000)]
Zygote : Block SIGCHLD during fork.
am:
dfcc79ee8e
Change-Id: I64b380e54d73c777898ece33ba62b838b556921b
Bill Yi [Thu, 10 Nov 2016 10:13:53 +0000 (02:13 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: I3116c8192dcb7e203d6551eaa50e6faf4220cd0e
Narayan Kamath [Thu, 10 Nov 2016 10:04:09 +0000 (10:04 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
Hugo Benichi [Tue, 19 Jul 2016 06:59:27 +0000 (15:59 +0900)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.
Bug:
24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
Alain Vongsouvanh [Thu, 10 Nov 2016 02:40:55 +0000 (02:40 +0000)]
colors: Properly set the default accent colors.
am:
7b371575e4
Change-Id: Icff01bd37726c9a77a80f1afb501390bb3ddc629
Alain Vongsouvanh [Wed, 9 Nov 2016 22:52:37 +0000 (14:52 -0800)]
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
TreeHugger Robot [Wed, 9 Nov 2016 23:05:39 +0000 (23:05 +0000)]
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
Xin Li [Wed, 9 Nov 2016 21:14:56 +0000 (21:14 +0000)]
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
Change-Id: Ie236947ac81a8415e0c382daf4a6527337d3e78b
Xin Li [Wed, 9 Nov 2016 21:13:43 +0000 (21:13 +0000)]
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
Change-Id: I5fda98c9f3c5f0c8abd133a960e32ef058c261c2
Xin Li [Wed, 9 Nov 2016 21:03:17 +0000 (21:03 +0000)]
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
Change-Id: I84618ae346458ff5db07a40aa6794900842bb222
Xin Li [Wed, 9 Nov 2016 21:02:08 +0000 (21:02 +0000)]
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
Change-Id: Ia972df65c6ad3da624c16cbe911474560286ac3d
Xin Li [Wed, 9 Nov 2016 20:52:19 +0000 (20:52 +0000)]
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
Change-Id: I52dc31670838c2d067bf262981885f5bf2be3445
Xin Li [Wed, 9 Nov 2016 20:51:08 +0000 (20:51 +0000)]
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
Change-Id: Icd01d06e42adc1995f555cc6e6bc146baee0fce1
Narayan Kamath [Wed, 9 Nov 2016 20:49:08 +0000 (20:49 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf am:
acdb6bb1aa am:
e3d31ebc0e
am:
dac1d242ab
Change-Id: If057ed9554180fd773113629ff32129f08d8eff3
Narayan Kamath [Wed, 9 Nov 2016 20:47:09 +0000 (20:47 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69 am:
4f65baa12f am:
76a388b93b -s ours
am:
30a6da2b14
Change-Id: I19477805ad4b8b5c66634dc33021461b17d99aca
Xin Li [Wed, 9 Nov 2016 20:46:08 +0000 (20:46 +0000)]
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
Change-Id: I8116a4a96c47bad2ff769fba878b863cc517c016
Xin Li [Wed, 9 Nov 2016 20:45:40 +0000 (20:45 +0000)]
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
Change-Id: I5530c638ccd5ad8af4115e6d8c5f85351948811d
Xin Li [Wed, 9 Nov 2016 20:45:14 +0000 (20:45 +0000)]
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
Change-Id: I1c8d54f67f0e644e90856197a0713f7d6f86b33f
Xin Li [Wed, 9 Nov 2016 20:44:35 +0000 (20:44 +0000)]
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
Change-Id: I6301865f95712e610ab75031fe401386a8010efd
Narayan Kamath [Wed, 9 Nov 2016 20:41:16 +0000 (20:41 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf am:
acdb6bb1aa
am:
e3d31ebc0e
Change-Id: I27f374ed810a533e8df3111e1887e51520ebb3f1
Narayan Kamath [Wed, 9 Nov 2016 20:40:24 +0000 (20:40 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69 am:
4f65baa12f
am:
76a388b93b -s ours
Change-Id: Ie2473f3fce3c956c9b6bc1ce9903d4c53874ddd4
Xin Li [Wed, 9 Nov 2016 20:36:11 +0000 (20:36 +0000)]
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
Change-Id: I1dc24f01552359d8cdaea875f399878fa55ea2e0
Xin Li [Wed, 9 Nov 2016 20:35:03 +0000 (20:35 +0000)]
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
Change-Id: I2c144951b08fda465e0ee4ad4ba50f9ebe247a1c
Xin Li [Wed, 9 Nov 2016 20:34:42 +0000 (20:34 +0000)]
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
Change-Id: I0a1887ae82111b39e1dea53fadea452bc522c2ae
Xin Li [Wed, 9 Nov 2016 20:34:01 +0000 (20:34 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours am:
b9634f3081
am:
9dccfbc7c8
Change-Id: Ib02f82fa385a514d339331fc3f3b5309a8042fa5
Narayan Kamath [Wed, 9 Nov 2016 20:26:18 +0000 (20:26 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf
am:
acdb6bb1aa
Change-Id: I363a163de6d9856ca84cc153ce3ef7a4485dc22e
Narayan Kamath [Wed, 9 Nov 2016 20:25:13 +0000 (20:25 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69
am:
4f65baa12f
Change-Id: Ib482d999552ca44ccc000a4a2f5604e920db2079
Xin Li [Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)]
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
Change-Id: I0d66e9689c9ec4a2537cdd23a73ec4dbb74cfd1a
Xin Li [Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630
am:
1a06ebfcac
Change-Id: I062b547da4a7190f27de0979b9859d4ce4307b00
Xin Li [Wed, 9 Nov 2016 20:23:02 +0000 (20:23 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours
am:
b9634f3081
Change-Id: Icd07d2224a1b58800f7344ff3b7928b335904446
OSDN Git Service
