Chris Banes 8eddf287b4 am 437a2ac0: am 3d176d20: Merge "Fix tab indicator getting out of sync" into mnc-ub-dev ...

* commit '437a2ac0a70bdc2d43731ffb24fedf84615be47a':
  Fix tab indicator getting out of sync

GitOrigin-RevId=1bf420730ddf23747df283caf6f8eba8e86fe7be

PiperOrigin-RevId: 140549544

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

..

AnimationUtils.java

resolved conflicts for merge of 73a0c3c7 to master

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

CircularBorderDrawable.java

am 75962f62: am 40202264: am 3de57119: am cc102ca5: Merge "Re-enable border sheen (aka border)" into lmp-mr1-ub-dev

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

CoordinatorLayoutInsetsHelper.java

am 5c3341f5: am 4c37ebd8: Merge "Window inset support for CoL + AppBarLayout" into mnc-dev

2016-12-09 18:15:02 -08:00

FloatingActionButtonImpl.java

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

MathUtils.java

am 4ae83371: am cc29b5d7: am 302adaa3: Merge "Improve FloatingActionButton border implementation" into lmp-mr1-ub-dev

2016-12-09 18:16:10 -08:00

ShadowDrawableWrapper.java

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

ShadowViewDelegate.java

am 2ccb1350: am ec957eb4: Merge "Floating Action Button" into lmp-mr1-ub-dev

2016-12-09 17:56:20 -08:00

StateListAnimator.java

am c34969a0: am 56277ada: Merge "Fix FAB visibility=gone not working pre-v21" into mnc-ub-dev

2016-12-12 15:36:56 -08:00

ValueAnimatorCompat.java

am 437a2ac0: am 3d176d20: Merge "Fix tab indicator getting out of sync" into mnc-ub-dev

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