OSDN Git Service

resolved conflicts for merge of 1adca55f to mnc-dr-dev
[android-x86/packages-apps-Settings.git] / MODULE_LICENSE_APACHE2