Chris Banes 4816edf175 Merge "Don't dispatch nested scroll events to GONE views" into nyc-support-25.1-dev ...

GitOrigin-RevId=e47578f12b31591ae984b97a9746e6beeaeb093b

PiperOrigin-RevId: 141510105

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

..

base/android/support/design

…

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

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

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

res

Adds working lint target to support lib build, more workarounds

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

res-public/values

…

src

Merge "Don't dispatch nested scroll events to GONE views" into nyc-support-25.1-dev

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

tests

Merge "Don't dispatch nested scroll events to GONE views" into nyc-support-25.1-dev

2016-12-12 16:03:37 -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

…