OSDN Git Service
Andreas Huber [Thu, 10 Nov 2016 19:27:07 +0000 (19:27 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am:
df3d68c9b2 am:
fbb980e57b
am:
fdaf348734
Change-Id: Icc30767adea1ce61fe3bd87b395268db674ce021
Andreas Huber [Thu, 10 Nov 2016 19:14:30 +0000 (19:14 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am:
df3d68c9b2
am:
fbb980e57b
Change-Id: I7b80bbe5eed3066edfe26d83dd322114d2e4a961
Andreas Huber [Thu, 10 Nov 2016 19:08:28 +0000 (19:08 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
am:
df3d68c9b2
Change-Id: I56e293d16dee7503f717f3cca4902720307a2024
Treehugger Robot [Thu, 10 Nov 2016 18:58:28 +0000 (18:58 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
Chris Elliott [Thu, 10 Nov 2016 18:57:02 +0000 (18:57 +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
am:
e2dd105af2 -s ours
Change-Id: Iab445b20d02e9a501d74f27a59da5047957efc13
Hugo Benichi [Thu, 10 Nov 2016 18:55:34 +0000 (18:55 +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
am:
8fe310892b -s ours
Change-Id: I63236413fa5272bbfb8c4fba83879089007694bc
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
Randy Pan [Thu, 10 Nov 2016 16:32:56 +0000 (16:32 +0000)]
Merge "Wifi Tx/Rx rate computation" am:
bccf93311c am:
33600a3d38
am:
e929425a9e
Change-Id: Ia38e00d785c56c295007aa19f3fe1e70d6a8b494
Randy Pan [Thu, 10 Nov 2016 16:26:23 +0000 (16:26 +0000)]
Merge "Wifi Tx/Rx rate computation" am:
bccf93311c
am:
33600a3d38
Change-Id: I766decd0d68c9a2cb47d374c9a48c8eac59a6a67
Randy Pan [Thu, 10 Nov 2016 16:15:52 +0000 (16:15 +0000)]
Merge "Wifi Tx/Rx rate computation"
am:
bccf93311c
Change-Id: I8b564af08155dcb49cf5f71d283b21091b80d3e0
Randy Pan [Thu, 10 Nov 2016 16:02:58 +0000 (16:02 +0000)]
Merge "Wifi Tx/Rx rate computation"
Bill Yi [Thu, 10 Nov 2016 14:43:49 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e231af6c88 -s ours
am:
0006905319 -s ours
Change-Id: Ibdf03fc0e8582ef252ee5c922b206685de2b9829
Bill Yi [Thu, 10 Nov 2016 14:42:49 +0000 (14:42 +0000)]
Import translations. DO NOT MERGE am:
377d4af0d0 -s ours
am:
9d6ff72884 -s ours
Change-Id: I89064de048418230fb51e09ceb3d6bfd631101c1
Bill Yi [Thu, 10 Nov 2016 14:41:42 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0bf8ae56ff -s ours
am:
221c05e6d1 -s ours
Change-Id: I15d5908cbf02847651321cea840c10666aa1c245
Bill Yi [Thu, 10 Nov 2016 14:37:50 +0000 (14:37 +0000)]
Import translations. DO NOT MERGE am:
37fa5cbc28 -s ours
am:
35b2ed41ce -s ours
Change-Id: Ibc2fa8caa377cdf5433842929549359ce8e4b71b
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:41:46 +0000 (10:41 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc am:
e9a12d0ac7 am:
f0a65b9a98
am:
532d73cf8c
Change-Id: Id48f0410d3068bb4411d86841bbd476ff612848a
Narayan Kamath [Thu, 10 Nov 2016 10:40:31 +0000 (10:40 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7 am:
c82eb23651 am:
b0c09c0ebe
am:
847d4476a7
Change-Id: I818bc8e1cb3f67fec10edefa527efcdef100f211
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:47:29 +0000 (02:47 +0000)]
colors: Properly set the default accent colors. am:
7b371575e4
am:
e616fa1789
Change-Id: I111e3491c067fe286608c5df73f9d5da90373570
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
Selim Cinek [Wed, 9 Nov 2016 23:19:25 +0000 (23:19 +0000)]
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
am:
6a6bc370e9
Change-Id: Iae4342afea01390f6b2567832f863881907dacb0
Selim Cinek [Wed, 9 Nov 2016 23:19:19 +0000 (23:19 +0000)]
Fixed a bug with the emergency affordance in multi user
am:
0294f9e39b
Change-Id: Ib23d37b6ac5cc32aa77aa099c3fa2937ff3570d3
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:26:57 +0000 (21:26 +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
am:
a29c7c77b1
Change-Id: Id4428dfa09f0c0d24c045ce2ae2fb1abad3aaa15
Xin Li [Wed, 9 Nov 2016 21:25:42 +0000 (21:25 +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
am:
a009932a57
Change-Id: I5cf1015e071c8a98d63fc318088746c9728f3795
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
Narayan Kamath [Wed, 9 Nov 2016 21:00:09 +0000 (21:00 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf am:
acdb6bb1aa am:
e3d31ebc0e am:
dac1d242ab
am:
2b3a352a4d
Change-Id: Ic07434a6485eb20682f439bf0997543b54e8db07
Narayan Kamath [Wed, 9 Nov 2016 20:58:59 +0000 (20:58 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69 am:
4f65baa12f am:
76a388b93b -s ours am:
30a6da2b14
am:
c8044be01e
Change-Id: Iab263d21c1d33b7c8c07bbb00db41705988f9632
Xin Li [Wed, 9 Nov 2016 20:57:56 +0000 (20:57 +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
am:
b7f279051e
Change-Id: I0de48588205d46a800b4a945f364fab8e44e3f48
Xin Li [Wed, 9 Nov 2016 20:56:41 +0000 (20:56 +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
am:
3b4f8bc034
Change-Id: Ie39a05ce72f9d65ae6c5a76a6954a27966b7f667
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
Xin Li [Wed, 9 Nov 2016 20:23:01 +0000 (20:23 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba
am:
63c9a312a2
Change-Id: I5123223d1ba04f94d52261ab77d6ec33a0c7dc75
Xin Li [Wed, 9 Nov 2016 20:17:53 +0000 (20:17 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931
am:
eda0b0078e
Change-Id: Ibf745e727c36dd04b5cb30b574cca4b5709b9f4b
Xin Li [Wed, 9 Nov 2016 20:17:00 +0000 (20:17 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours
am:
6166af96ba
Change-Id: I591eb39cc8f7e3528a35ae1d98f641fdf12c4082
Narayan Kamath [Wed, 9 Nov 2016 20:13:19 +0000 (20:13 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev
am:
12f98789bf
Change-Id: Ib86b20a2e51cac443adc73d5c18bca73ac316613
Narayan Kamath [Wed, 9 Nov 2016 20:13:16 +0000 (20:13 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
25cd01cc69
Change-Id: I64dce88921b36a58dc66cd4b89e571ce9b8114eb
Xin Li [Wed, 9 Nov 2016 20:11:43 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
am:
49b144e630
Change-Id: Ib96a27383309fee13040dae1e12c23802a17f19f
Xin Li [Wed, 9 Nov 2016 20:11:42 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
am:
cc115c5931
Change-Id: I9e226ffdca4c3633061f0202da367e2be0eeeb1f
Xin Li [Wed, 9 Nov 2016 20:11:38 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev.
am:
9b9906e9c0 -s ours
Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c
Xin Li [Wed, 9 Nov 2016 20:11:37 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev.
am:
ee2903686f -s ours
Change-Id: I565953c9962f328055512615185de735c33a50bb
Sohani Rao [Wed, 9 Nov 2016 19:42:35 +0000 (19:42 +0000)]
Merge "Update REQUEST_PEERS message with calling package" am:
836e74052e am:
e8431a09ca
am:
dbacbe3fbe
Change-Id: Ia5df0103767d537f74f254cc12bd175f65787537
Sohani Rao [Wed, 9 Nov 2016 19:32:06 +0000 (19:32 +0000)]
Merge "Update REQUEST_PEERS message with calling package" am:
836e74052e
am:
e8431a09ca
Change-Id: If5f4f60919f2f4083f109e1609ecd1834030f1c8
Sohani Rao [Wed, 9 Nov 2016 19:26:51 +0000 (19:26 +0000)]
Merge "Update REQUEST_PEERS message with calling package"
am:
836e74052e
Change-Id: Ib22ae41f991ce68d47e2f7437984c7fa248dd235
Damien Bargiacchi [Wed, 9 Nov 2016 19:22:29 +0000 (19:22 +0000)]
Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev am:
7da025f142
am:
bcbd1f8110
Change-Id: I6c85c5ff922eee94a2d61f7d4c92523d322d1881
Damien Bargiacchi [Wed, 9 Nov 2016 19:21:29 +0000 (19:21 +0000)]
Allow config.xml to set the default display's default color mode am:
4364bbf93f
am:
4e9436261f
Change-Id: Id468f9e353ae159df5cd730655fe7ce4a43696cf
Sohani Rao [Wed, 9 Nov 2016 19:15:43 +0000 (19:15 +0000)]
Merge "Update REQUEST_PEERS message with calling package"
Damien Bargiacchi [Wed, 9 Nov 2016 19:14:33 +0000 (19:14 +0000)]
Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev
am:
7da025f142
Change-Id: I52cf76707b3273aa92d566487189db2a593bedaa
Damien Bargiacchi [Wed, 9 Nov 2016 19:14:26 +0000 (19:14 +0000)]
Allow config.xml to set the default display's default color mode
am:
4364bbf93f
Change-Id: I6d68be94598f3fe28225826e00459d5707b7ecee
Damien Bargiacchi [Wed, 9 Nov 2016 19:05:34 +0000 (19:05 +0000)]
Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev