resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp

            || !strcasecmp(extension, ".rtttl")

            || !strcasecmp(extension, ".rtx")

            || !strcasecmp(extension, ".ota")) {

        return HandleMIDI(path, &client);

        status_t status = HandleMIDI(path, &client);

        if (status != OK) {

            return status;

        }

    if (mRetriever->setDataSource(path) == OK

    } else if (mRetriever->setDataSource(path) == OK

            && mRetriever->setMode(

                METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) {

        const char *value;