Change-Id: I7333ab029511fd5fb3ae413c856df4b9b5fd5e78
Signed-off-by: kangpele <kangpele@gmail.com>
Merge branch 'nya_119'

Conflicts:
	ddr/src/com/example/ddr/MainActivity.java