Yuichi Araki 5b508e285f Merge "Handle ACTION_DISMISS in BottomSheetDialog" into nyc-support-25.1-dev ...

GitOrigin-RevId=d91caeb62e0381daae5dde3a3762587e02329f1c

PiperOrigin-RevId: 141508961

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

Merge "Update TextInputLayout icon for spec update" into nyc-support-25.1-dev

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

res-public/values

…

src

Merge "Handle ACTION_DISMISS in BottomSheetDialog" into nyc-support-25.1-dev

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

tests

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

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

…