Chris Banes 76f08c75ad Merge "Revert "Add default style attrs for design components"" into nyc-dev ...

GitOrigin-RevId=67bad837194c39a022050c45379ef14f0ad074ff

PiperOrigin-RevId: 140560016

2016-12-12 15:49:53 -08:00

..

attrs.xml

Merge "Revert "Add default style attrs for design components"" into nyc-dev

2016-12-12 15:49:53 -08:00

colors.xml

Merge "Fix error colours in design lib" into mnc-ub-dev am: c37d0d5de3

2016-12-12 15:48:26 -08:00

config.xml

am 1fddbd99: am fe71b8ba: am 025760e0: am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev

2016-12-09 18:21:16 -08:00

dimens.xml

Merge "Use correct max width for NavigationView" into mnc-ub-dev am: 777691195d

2016-12-12 15:45:24 -08:00

ids.xml

resolved conflicts for merge of 73a0c3c7 to master

2016-12-09 18:13:19 -08:00

integers.xml

Merge "BottomSheetDialog and BottomSheetDialogFragment" into mnc-ub-dev am: 623321eab7

2016-12-12 15:45:04 -08:00

strings.xml

Merge "BottomSheetDialog and BottomSheetDialogFragment" into mnc-ub-dev am: 623321eab7

2016-12-12 15:45:04 -08:00

styles.xml

Merge "Fix error colours in design lib" into mnc-ub-dev am: c37d0d5de3

2016-12-12 15:48:26 -08:00

themes.xml

Merge "Fix error colours in design lib" into mnc-ub-dev am: c37d0d5de3

2016-12-12 15:48:26 -08:00