• Conflicts:
    	examples/animated-shapes/animated-shapes-example.cpp
    	examples/new-window/new-window-example.cpp
    	examples/path-animation/path-animation.cpp
    	examples/radial-menu/radial-menu-example.cpp
    	examples/radial-menu/radial-sweep-view-impl.h
    	examples/radial-menu/radial-sweep-view.cpp
    	examples/refraction-effect/refraction-effect-example.cpp
    
    Change-Id: I9da2bc5f3145cd179535081fca2d2504f4fd6cd6
    Francisco Santos authored
     
    Browse Code »