OSDN Git Service
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
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: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
TreeHugger Robot [Fri, 11 Nov 2016 19:29:57 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
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 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: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: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: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 [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
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
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: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
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
Narayan Kamath [Mon, 7 Nov 2016 16:22:48 +0000 (16:22 +0000)]
Zygote : Block SIGCHLD during fork.
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.
To prevent this from happening, block SIGCHLD during this critical
section.
Bug:
32693692
Test: Manual
(cherry picked from commit
e9a525829a354c92983a35455ccab16d1b0d3892)
Zygote: Unblock SIGCHLD in the parent after fork.
Follow up to change
e9a525829a354c92983a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.
Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug:
32693692
Test: manual
(cherry picked from commit
c7161f756e86b98f2244a04d9207b47149965fd7)
Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
Narayan Kamath [Wed, 9 Nov 2016 09:48:38 +0000 (09:48 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev
TreeHugger Robot [Wed, 9 Nov 2016 02:26:14 +0000 (02:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 9 Nov 2016 01:24:36 +0000 (17:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32363164
Change-Id: I8b2e02fa6ddcf65e7bd9f413e9d31022b60b57a5
Xin Li [Tue, 8 Nov 2016 21:25:38 +0000 (21:25 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
Xin Li [Tue, 8 Nov 2016 21:24:55 +0000 (21:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
Bill Yi [Tue, 8 Nov 2016 12:02:48 +0000 (12:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
197da1f978 -s ours
Change-Id: Ia680464b0a45ab4ec9be1521adf5d31063622cae
Bill Yi [Tue, 8 Nov 2016 12:02:47 +0000 (12:02 +0000)]
Import translations. DO NOT MERGE
am:
7821bbd9a5 -s ours
Change-Id: I026f6272bc57f0a16d87cb578668aeecea44c772
TreeHugger Robot [Tue, 8 Nov 2016 11:56:59 +0000 (11:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 8 Nov 2016 11:53:17 +0000 (11:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 8 Nov 2016 10:03:00 +0000 (02:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1caa69921dbde7442c433f3373f17a442d1b48b3
Auto-generated-cl: translation import
Bill Yi [Tue, 8 Nov 2016 04:59:23 +0000 (20:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd8a71ffdf6db4fcfa0a001ffded8b51a729b10d
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 8 Nov 2016 03:21:10 +0000 (03:21 +0000)]
Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev
Jeff Sharkey [Tue, 8 Nov 2016 01:02:12 +0000 (01:02 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995 am:
09e10e54f8 am:
a61e5fb9f6 am:
e9cd3aea19
am:
557389d96b
Change-Id: I587ecb5f31246677c6e57814cb744ef2bb38572b
Jeff Sharkey [Tue, 8 Nov 2016 00:55:36 +0000 (00:55 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390 am:
babd7e06d3 am:
8554f2d934 am:
acdcb74361
am:
4ef12b0404
Change-Id: Ie986c43f72b3bc9140f23df71845fb2c0978c29e
Jeff Sharkey [Tue, 8 Nov 2016 00:53:15 +0000 (00:53 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c am:
8e803f734a am:
874a7af9f7 am:
aaeb6286fe
am:
4448f11e8a
Change-Id: Ic5676d9bed87fa5777eee1ce578b6402d4274645
Jeff Sharkey [Tue, 8 Nov 2016 00:49:41 +0000 (00:49 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995 am:
09e10e54f8 am:
a61e5fb9f6
am:
e9cd3aea19
Change-Id: I3b61d8fa4e3ad2ba0ba99e6918ace3a5871e128e
Jeff Sharkey [Tue, 8 Nov 2016 00:47:56 +0000 (00:47 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390 am:
babd7e06d3 am:
8554f2d934
am:
acdcb74361
Change-Id: I78abfa2adb14c2065117be41568d0fba90a277f7
Jeff Sharkey [Tue, 8 Nov 2016 00:42:43 +0000 (00:42 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c am:
8e803f734a am:
874a7af9f7
am:
aaeb6286fe
Change-Id: I33a40f027ecbd233f7e8cafd61f50479ff565dd8
Jeff Sharkey [Tue, 8 Nov 2016 00:42:42 +0000 (00:42 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433 am:
84ef9e69fc am:
e4419f474e am:
d93ed63baa
am:
a27ca045e5
Change-Id: Ie91c35c5b148e8d51dc54c398ce019e4f2046a31
Jeff Sharkey [Tue, 8 Nov 2016 00:35:26 +0000 (00:35 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433 am:
84ef9e69fc am:
e4419f474e
am:
d93ed63baa
Change-Id: I1d2a9bd0af847b8316720651bc2192151f999bcd
Jeff Sharkey [Tue, 8 Nov 2016 00:33:50 +0000 (00:33 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995 am:
09e10e54f8
am:
a61e5fb9f6
Change-Id: I3716aa9bfc3816e9a0159560daf755fcf89904f1
Jeff Sharkey [Tue, 8 Nov 2016 00:32:05 +0000 (00:32 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390 am:
babd7e06d3
am:
8554f2d934
Change-Id: I81c9598e3434fe44f1324a4115a9eda39047070d
Jeff Sharkey [Tue, 8 Nov 2016 00:31:42 +0000 (00:31 +0000)]
Public volumes belong to a single user. am:
def2123f56 -s ours am:
de221f06a3 am:
9854b1707c
am:
5cae493d1b
Change-Id: I1a16cfda1a9513824f98def5a257da4abe2dc758
Jeff Sharkey [Tue, 8 Nov 2016 00:29:22 +0000 (00:29 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c am:
8e803f734a
am:
874a7af9f7
Change-Id: Ia13bf45bfb0ac5057a2a8899b0bd543c238d7d3e
Jeff Sharkey [Tue, 8 Nov 2016 00:25:31 +0000 (00:25 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433 am:
84ef9e69fc
am:
e4419f474e
Change-Id: Ic7ac4b928536fb5d7b18957d35e2ca1aea832fed
Jeff Sharkey [Tue, 8 Nov 2016 00:19:39 +0000 (00:19 +0000)]
Public volumes belong to a single user. am:
def2123f56 -s ours am:
de221f06a3
am:
9854b1707c
Change-Id: I35e050710d0af31631ac2b0f823ed2fcabf174e2