OSDN Git Service

resolved conflicts for merge of 45d7b748 to klp-modular-dev-plus-aosp