CY Cheng 0f7856add6 resolve merge conflicts of e58c780571 to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352

2018-08-16 10:43:49 +00:00

..

arrays_car.xml

…

arrays_tv.xml

Update string referring UDSActivity package name

2018-02-14 01:25:23 +00:00

attrs_car.xml

Refactor CarVolumeDialogImpl to use CarAudioManager

2018-05-03 15:21:14 -07:00

attrs.xml

Tweak new rotate icon and motion

2018-05-24 14:05:44 -07:00

bools.xml

Hide user switcher from QS on phones.

2018-03-22 17:55:45 -04:00

colors_car.xml

Apply tint to the Volume Dialog primary and supplement icon

2018-05-24 17:31:50 -07:00

colors_tv.xml

…

colors.xml

Quick scrub has gradient follow user drag

2018-06-25 11:06:36 -07:00

config_car.xml

Allow for the lock screen to have a different set of nav buttons

2018-04-24 12:01:47 -07:00

config_tv.xml

…

config.xml

Merge "Fork navbar layout for quickstep" into pi-dev

2018-05-24 12:14:13 -07:00

defaults.xml

…

dimens_car.xml

DO NOT MERGE

2018-05-23 18:54:53 +00:00

dimens_grid.xml

…

dimens.xml

resolve merge conflicts of e58c780571 to stage-aosp-master

2018-08-16 10:43:49 +00:00

donottranslate.xml

Shorter date format on lock screen and AOD

2018-01-24 17:11:11 -08:00

ids_car.xml

Allow for the lock screen to have a different set of nav buttons

2018-04-24 12:01:47 -07:00

ids.xml

Merge "Fixed an issue where icons could remain white" into pi-dev

2018-05-17 01:22:41 +00:00

integers_car.xml

UI modifications for user picker

2018-04-06 19:39:54 +00:00

integers.xml

[QS] Add PageIndicator to footer

2018-04-13 11:34:47 -04:00

internal.xml

…

mland_config.xml

…

mland_strings.xml

…

strings_car.xml

Refactoring the User Switcher layout files to use dimensions in

2018-04-21 02:11:23 +00:00

strings_tv.xml

…

strings.xml

Remove managed profile toast

2018-06-21 14:05:01 -04:00

styles_tv.xml

…

styles.xml

Tweak new rotate icon and motion

2018-05-24 14:05:44 -07:00