test_commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidAnimTranslate/bin/AndroidAnimTranslate.apk
	AndroidAnimTranslate/bin/classes.dex

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/AndroidAnimTranslateActivity.class

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/BuildConfig.class

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/R$id.class

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/R$layout.class

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/R$string.class
	AndroidAnimTranslate/bin/resources.ap_
	AndroidAnimTranslate/gen/com/exercise/AndroidAnimTranslate/R.java
	AndroidAnimTranslate/res/layout/buttons.xml