OSDN Git Service

resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp
[android-x86/frameworks-base.git] / keystore / MODULE_LICENSE_APACHE2