OSDN Git Service

resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp