Yuichi Araki 7ed2147249 Merge "Fix BottomSheetDialog when it is short" into mnc-ub-dev ...

am: 7cf2a13442

* commit '7cf2a134424e8d7a5095f0df1749bfe871dabb8a':
  Fix BottomSheetDialog when it is short

GitOrigin-RevId=bec43dcc29fb7a3494139b470b0481106e1973a9

PiperOrigin-RevId: 140560111

2016-12-12 15:50:55 -08:00

..

anim

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

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

anim-v21

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

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

drawable

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

layout

Merge "Fix BottomSheetDialog when it is short" into mnc-ub-dev

2016-12-12 15:50:55 -08:00

layout-sw600dp

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

values

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

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

values-land

am a5f441b7: am 320c3e9f: New TabLayout

2016-12-09 18:09:27 -08:00

values-sw600dp

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

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