Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8 to master ...

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

2020-12-08 11:01:05 -07:00

..

ArcMotion.java

…

AutoTransition.java

…

ChangeBounds.java

…

ChangeClipBounds.java

…

ChangeImageTransform.java

…

ChangeScroll.java

…

ChangeText.java

…

ChangeTransform.java

…

CircularPropagation.java

…

Crossfade.java

…

Explode.java

…

Fade.java

…

OWNERS

…

package.html

…

PathMotion.java

…

PatternPathMotion.java

…

Recolor.java

…

Rotate.java

…

Scene.java

…

SidePropagation.java

…

Slide.java

…

Transition.java

…

TransitionInflater.java

…

TransitionListenerAdapter.java

…

TransitionManager.java

…

TransitionPropagation.java

…

TransitionSet.java

…

TransitionUtils.java

…

TransitionValues.java

…

TransitionValuesMaps.java

…

TranslationAnimationCreator.java

…

Visibility.java

…

VisibilityPropagation.java

…