Trevor Johns 682c24e228 Resolve merge conflicts of a5060ee to nyc-dev ...

This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086

2016-04-19 02:03:59 -07:00

..

anim_card_flip.mp4

…

anim_card_flip.ogv

…

anim_card_flip.webm

…

anim_crossfade.mp4

…

anim_crossfade.ogv

…

anim_crossfade.webm

…

anim_layout_changes.mp4

…

anim_layout_changes.ogv

…

anim_layout_changes.webm

…

anim_page_transformer_depth.mp4

…

anim_page_transformer_depth.ogv

…

anim_page_transformer_depth.webm

…

anim_page_transformer_zoomout.mp4

…

anim_page_transformer_zoomout.ogv

…

anim_page_transformer_zoomout.webm

…

anim_screenslide.mp4

…

anim_screenslide.ogv

…

anim_screenslide.webm

…

anim_zoom.mp4

…

anim_zoom.ogv

…

anim_zoom.webm

…

cardflip.jd

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

crossfade.jd

…

index.jd

…

layout.jd

…

screen-slide.jd

docs: Fixed ViewPager animation tutorial. Bug: 12815243

2014-02-07 20:44:44 +00:00

zoom.jd

…