OSDN Git Service

resolved conflicts for merge of 8de47a2f to honeycomb-LTE
[android-x86/frameworks-base.git] / MODULE_LICENSE_APACHE2