Chris Banes 5ae03b2b92 Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276 ...

am: eb06ff6cee

* commit 'eb06ff6cee70f60989ef4aa8f41b72b5a47be62d':
  Add compat padding to FloatingActionButton ala CardView

GitOrigin-RevId=7d1cf521d4f62da85bc6abc59ec116b41f86ba53

PiperOrigin-RevId: 140551325

2016-12-12 15:42:52 -08:00

..

attrs.xml

Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276

2016-12-12 15:42:52 -08:00

colors.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

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 "Add getContentRect() API to FloatingActionButton" into mnc-ub-dev am: c17e2d21b9

2016-12-12 15:42:32 -08:00

ids.xml

resolved conflicts for merge of 73a0c3c7 to master

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

strings.xml

Merge "Fixes for TextInputLayout" into mnc-ub-dev am: 5db2eb25a6

2016-12-12 15:42:16 -08:00

styles.xml

Merge "Fixes for TextInputLayout" into mnc-ub-dev am: 5db2eb25a6

2016-12-12 15:42:16 -08:00