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_