cuican 3b0e5b675c Merge branch 'master' of http://git.trustie.net/ZYL000/xiaomi ... # Conflicts: # micode notesTest-test/.classpath # micode notesTest-test/bin/classes.dex # micode notesTest-test/bin/micode notesTest.apk # micode notesTest-test/bin/resources.ap_		2015-12-16 01:15:04 +08:00
Notes-master	Merge branch 'master' of http://git.trustie.net/ZYL000/xiaomi	2015-12-16 01:15:04 +08:00
micode notesTest-test	Merge branch 'master' of http://git.trustie.net/ZYL000/xiaomi	2015-12-16 01:15:04 +08:00