OSDN Git Service

resolve merge conflicts of b29a938c to nyc-dev
[android-x86/frameworks-base.git] / MODULE_LICENSE_APACHE2