Omiting
Merge branch 'master' of https://github.com/arvj2/android-design

Conflicts:
	api-demos/src/com/jvra/demos/animation/BouncingBalls.java