Commit Graph

256595 Commits

Author SHA1 Message Date
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

Change-Id: I2c144951b08fda465e0ee4ad4ba50f9ebe247a1c
2016-11-09 20:35:03 +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

Change-Id: Ib02f82fa385a514d339331fc3f3b5309a8042fa5
2016-11-09 20:34:01 +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

Change-Id: I062b547da4a7190f27de0979b9859d4ce4307b00
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

Change-Id: Icd07d2224a1b58800f7344ff3b7928b335904446
2016-11-09 20:23:02 +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

Change-Id: Ib96a27383309fee13040dae1e12c23802a17f19f
2016-11-09 20:11:43 +00:00
Xin Li
b9634f3081 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev.
am: 9b9906e9c0  -s ours

Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c
2016-11-09 20:11:38 +00:00
Damien Bargiacchi
7da025f142 Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev 2016-11-09 19:05:37 +00:00
TreeHugger Robot
aa13d0f09d Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-11-09 02:26:16 +00:00
Bill Yi
95cd3f1976 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32363164
Change-Id: I8b2e02fa6ddcf65e7bd9f413e9d31022b60b57a5
2016-11-08 17:24:36 -08:00
Xin Li
49b144e630 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev 2016-11-08 21:24:59 +00:00
Bill Yi
5501036062 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 197da1f978  -s ours

Change-Id: Ia680464b0a45ab4ec9be1521adf5d31063622cae
2016-11-08 12:02:48 +00:00
Bill Yi
82b5fa3fea Import translations. DO NOT MERGE
am: 7821bbd9a5  -s ours

Change-Id: I026f6272bc57f0a16d87cb578668aeecea44c772
2016-11-08 12:02:47 +00:00
TreeHugger Robot
0a2dbc7a8f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-11-08 11:57:02 +00:00
TreeHugger Robot
197da1f978 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-11-08 11:53:19 +00:00
Bill Yi
7821bbd9a5 Import translations. DO NOT MERGE
Change-Id: I1caa69921dbde7442c433f3373f17a442d1b48b3
Auto-generated-cl: translation import
2016-11-08 02:03:00 -08:00
Bill Yi
aa451616c8 Import translations. DO NOT MERGE
Change-Id: Icd8a71ffdf6db4fcfa0a001ffded8b51a729b10d
Auto-generated-cl: translation import
2016-11-07 20:59:23 -08:00
TreeHugger Robot
4ad89bf51f Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev 2016-11-08 03:21:14 +00:00
Jeff Sharkey
bd314fa444 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
2016-11-08 01:02:12 +00:00
Jeff Sharkey
a8f9a6201b Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934 am: acdcb74361
am: 4ef12b0404

Change-Id: Ie986c43f72b3bc9140f23df71845fb2c0978c29e
2016-11-08 00:55:36 +00:00
Jeff Sharkey
dd01f35677 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
2016-11-08 00:53:15 +00:00
Jeff Sharkey
557389d96b 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
2016-11-08 00:49:41 +00:00
Jeff Sharkey
4ef12b0404 Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934
am: acdcb74361

Change-Id: I78abfa2adb14c2065117be41568d0fba90a277f7
2016-11-08 00:47:56 +00:00
Jeff Sharkey
4448f11e8a 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
2016-11-08 00:42:43 +00:00
Jeff Sharkey
a3d8d2e73e Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e am: d93ed63baa
am: a27ca045e5

Change-Id: Ie91c35c5b148e8d51dc54c398ce019e4f2046a31
2016-11-08 00:42:42 +00:00
Jeff Sharkey
a27ca045e5 Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e
am: d93ed63baa

Change-Id: I1d2a9bd0af847b8316720651bc2192151f999bcd
2016-11-08 00:35:26 +00:00
Jeff Sharkey
e9cd3aea19 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8
am: a61e5fb9f6

Change-Id: I3716aa9bfc3816e9a0159560daf755fcf89904f1
2016-11-08 00:33:50 +00:00
Jeff Sharkey
acdcb74361 Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3
am: 8554f2d934

Change-Id: I81c9598e3434fe44f1324a4115a9eda39047070d
2016-11-08 00:32:05 +00:00
Jeff Sharkey
cf2d99289c Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3 am: 9854b1707c
am: 5cae493d1b

Change-Id: I1a16cfda1a9513824f98def5a257da4abe2dc758
2016-11-08 00:31:42 +00:00
Jeff Sharkey
aaeb6286fe Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a
am: 874a7af9f7

Change-Id: Ia13bf45bfb0ac5057a2a8899b0bd543c238d7d3e
2016-11-08 00:29:22 +00:00
Jeff Sharkey
d93ed63baa Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc
am: e4419f474e

Change-Id: Ic7ac4b928536fb5d7b18957d35e2ca1aea832fed
2016-11-08 00:25:31 +00:00
Jeff Sharkey
5cae493d1b Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3
am: 9854b1707c

Change-Id: I35e050710d0af31631ac2b0f823ed2fcabf174e2
2016-11-08 00:19:39 +00:00
Jeff Sharkey
a61e5fb9f6 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995
am: 09e10e54f8

Change-Id: I1bb3bc5f0db563797262a8e4485f4ede25db4c99
2016-11-08 00:17:51 +00:00
Jeff Sharkey
8554f2d934 Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390
am: babd7e06d3

Change-Id: Ib810882924443e195b31d505f8d1657914c6edfe
2016-11-08 00:16:13 +00:00
Jeff Sharkey
874a7af9f7 Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c
am: 8e803f734a

Change-Id: I80f21d5df3b37c27a9c56c1412ae942b88264349
2016-11-08 00:13:51 +00:00
Jeff Sharkey
e4419f474e Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433
am: 84ef9e69fc

Change-Id: Icf8d31fa28b1223d3f789ff653bbecfbcf87bcfb
2016-11-08 00:10:32 +00:00
Jeff Sharkey
9854b1707c Public volumes belong to a single user. am: def2123f56 -s ours
am: de221f06a3

Change-Id: I73f0c785931688020dcdc5bd16f54449f0bf6f51
2016-11-08 00:09:41 +00:00
Jeff Sharkey
09e10e54f8 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61
am: 0a23c1a995

Change-Id: Ib501fa0ed255de6ac64aae58ad12eaec4889d46e
2016-11-08 00:04:28 +00:00
Jeff Sharkey
babd7e06d3 Public volumes belong to a single user. am: 6b0079d3bc
am: dc89fb9390

Change-Id: I2b4587edb6ae1a7c4c0eb4532a7af36143c20da5
2016-11-08 00:03:04 +00:00
Jeff Sharkey
8e803f734a Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab
am: 7738ebcd5c

Change-Id: Ib812b973ddb26098f10bd88a7ec19573bdf900c0
2016-11-08 00:01:30 +00:00
Jeff Sharkey
de221f06a3 Public volumes belong to a single user.
am: def2123f56  -s ours

Change-Id: I2e71df725f742ab1e29f9b0f7f89285f659f8a35
2016-11-07 23:59:45 +00:00
Jeff Sharkey
84ef9e69fc Public volumes belong to a single user. am: 3a062a67fa am: e80720a731
am: 59bb608433

Change-Id: I6cdf548573e909e11239e9a7a2f4190750a79758
2016-11-07 23:59:38 +00:00
Jeff Sharkey
299aa88e26 Merge "Public volumes belong to a single user." into nyc-dev am: d537f76b88 am: 930e77314b
am: 8c73d7989f

Change-Id: Iae899873091306c2e86e184187bea695a1b928bc
2016-11-07 23:59:18 +00:00
Jeff Sharkey
8b2091ea94 Public volumes belong to a single user. am: 6566fbe99b am: 50cc6c111c
am: 0b28736f03

Change-Id: I3f00c1c9a48d064d759e7c3727c4f40c732aa9da
2016-11-07 23:57:38 +00:00
Jeff Sharkey
83287ac02c Merge "Public volumes belong to a single user." into nyc-mr1-dev
am: 0f35d29a7e

Change-Id: I6948a2b174ab8a328fdedf80f0adc564aec93e60
2016-11-07 23:54:57 +00:00
Jeff Sharkey
f91147036f Public volumes belong to a single user.
am: 8b38d083c4

Change-Id: I659a2bb47472c71a7248ccb54281073a24e8a19d
2016-11-07 23:54:51 +00:00
Jeff Sharkey
0a23c1a995 Merge "Public volumes belong to a single user." into mnc-dr-dev
am: b232177c61

Change-Id: I0188c9744af905133ad36ab45705828d5286b804
2016-11-07 23:54:41 +00:00
Jeff Sharkey
dc89fb9390 Public volumes belong to a single user.
am: 6b0079d3bc

Change-Id: Ibcd6221eaa3e15dddd0682c21eae2460cdf1683f
2016-11-07 23:54:35 +00:00
Jeff Sharkey
8c73d7989f Merge "Public volumes belong to a single user." into nyc-dev am: d537f76b88
am: 930e77314b

Change-Id: I0dfbf6667e2a8c9f696274aaca08124b6a41d378
2016-11-07 23:51:20 +00:00
Jeff Sharkey
0b28736f03 Public volumes belong to a single user. am: 6566fbe99b
am: 50cc6c111c

Change-Id: Id8b1fa49f1b2ebef27c0e9f81486c6964781fb68
2016-11-07 23:50:07 +00:00
Jeff Sharkey
7738ebcd5c Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7
am: 60acc3e6ab

Change-Id: I105a361b58b19c1102bef2c88a0ad5f281c793c6
2016-11-07 23:48:57 +00:00