Chris Banes daff0d4e5d Merge "More customization methods for CollapsingToolbarLayout" into nyc-dev ...

am: 66955d2dab

* commit '66955d2dabd46843d3d70ec3864413b8a7e80a8e':
  More customization methods for CollapsingToolbarLayout

Change-Id: I38d1ec6a1b5484f44b2509cb1ef035886c9ca266

GitOrigin-RevId=3c15f54d5e1ce8d577cc76804ccf0a4ba86d6ced

PiperOrigin-RevId: 140560891

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

..

attrs.xml

Merge "More customization methods for CollapsingToolbarLayout" into nyc-dev

2016-12-12 15:54:24 -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 "Use StateListAnimator for AppBarLayout elevation changes" into nyc-dev

2016-12-12 15:53: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