OSDN Git Service

resolve merge conflicts of f2801e4 to nyc-mr1-dev
[android-x86/packages-apps-Settings.git] / MODULE_LICENSE_APACHE2