Change-Id: I88de21d11fefd25b2a7f77dd9f55dd79c7872a2e
Signed-off-by: kangpele <kangpele@gmail.com>


Change-Id: I37a8069e2422426a52f8e63a6cd9e799950e8cb3
Signed-off-by: kangpele <kangpele@gmail.com>
Merge remote-tracking branch 'origin/nya_119'

Conflicts:
	ddr/bin/classes/com/example/ddr/MainActivity.class