Yuichi Araki 96565fdded am 121c9e90: am 4e9e5d59: Merge "Initial implementation of BottomSheet" into mnc-ub-dev ...

* commit '121c9e90d5c41a74341a77d18c94f810b73e43f7':
  Initial implementation of BottomSheet

GitOrigin-RevId=76fc679eb0d8f1d92ade726550f59a7781de42a0

PiperOrigin-RevId: 140550524

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

..

attrs.xml

am 121c9e90: am 4e9e5d59: Merge "Initial implementation of BottomSheet" into mnc-ub-dev

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

am 2d53b446: am 9c1a007d: Merge "TabLayout measure performance improvements" into mnc-ub-dev

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

ids.xml

resolved conflicts for merge of 73a0c3c7 to master

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

strings.xml

am c14d808e: am 0e245015: Merge "Add support for character counter" into mnc-ub-dev

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

styles.xml

am c14d808e: am 0e245015: Merge "Add support for character counter" into mnc-ub-dev

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