Chris Banes 1010b1c2ba Merge "Allow TabLayout items to be added in a layout" into mnc-ub-dev am: d54168f673 ...

am: b9fb26837f

* commit 'b9fb26837fabff91b40b710f956fe9ce67b126bc':
  Allow TabLayout items to be added in a layout

GitOrigin-RevId=d910e8fb9d1412764450a5b4e7908ae5804396ef

PiperOrigin-RevId: 140559553

2016-12-12 15:46:35 -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 BottomSheet over ScrollView" into mnc-ub-dev am: 129ef23221

2016-12-12 15:46:01 -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 "Allow TabLayout items to be added in a layout" into mnc-ub-dev am: d54168f673

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