Merge branch 'master' into lab-general
Merge branch 'lab-general' into lab-android
Merge branch 'master' into lab-general
Merge branch 'lab-general' into lab-android
Merge branch 'master' into lab-general
Merge branch 'lab-general' into lab-android
Merge branch 'lab-android' of github.com:Rockbox-Chinese-Community/Rockbox-RCC into lab-android