Chris Banes 992ac23449 Merge "Fix CollapsingToolbarLayout scrim not being drawn" into nyc-support-25.1-dev ...

GitOrigin-RevId=9e34c75622e53a85a686a8d457e9b648633e67da

PiperOrigin-RevId: 141514714

2016-12-12 16:04:58 -08:00

..

base/android/support/design

Merge "Fix FAB setBackgroundTintList on L+" into nyc-support-25.1-dev

2016-12-12 16:04:23 -08:00

gingerbread/android/support/design/widget

Merge remote-tracking branch 'goog/master' into ffwd

2016-12-12 16:03:00 -08:00

honeycomb/android/support/design/widget

Merge "Annotate support classes with RequiresApi / TargetApi"

2016-12-12 16:02:22 -08:00

honeycomb-mr1/android/support/design/widget

Merge "Annotate support classes with RequiresApi / TargetApi"

2016-12-12 16:02:22 -08:00

ics/android/support/design

Merge remote-tracking branch 'goog/master' into ffwd

2016-12-12 16:03:00 -08:00

jvm-tests

Begin syncing to 25.1.0 design library code.

2016-12-12 16:01:37 -08:00

lollipop/android/support/design/widget

Support design - fix FAB elevation in API 21

2016-12-12 16:04:41 -08:00

res

Merge "Small TextInputLayout label fixes" into nyc-support-25.1-dev

2016-12-12 16:04:19 -08:00

res-public/values

Add gradle wrapper and associated files, restructure top-level directories.

2016-12-12 16:01:26 -08:00

src

Merge "Fix CollapsingToolbarLayout scrim not being drawn" into nyc-support-25.1-dev

2016-12-12 16:04:58 -08:00

tests

Merge "Fix CollapsingToolbarLayout scrim not being drawn" into nyc-support-25.1-dev

2016-12-12 16:04:58 -08:00

AndroidManifest.xml

Revert "Add support lib version meta-data to AndroidManifest.xml"

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

build.gradle

Setup a basic gradle build.

2016-12-12 16:01:31 -08:00

proguard-rules.pro

Add gradle wrapper and associated files, restructure top-level directories.

2016-12-12 16:01:26 -08:00