resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev

    android::Parcel* p = android::parcelForJavaObject(env, parcel);

    SkRegion* region = new SkRegion;

    size_t size = p->readInt32();

    region->readFromMemory(p->readInplace(size), size);

    const void* regionData = p->readInplace(size);

    if (regionData == NULL) {

        return NULL;

    }

    SkRegion* region = new SkRegion;

    size_t actualSize = region->readFromMemory(regionData, size);

    if (size != actualSize) {

        delete region;

        return NULL;

    }

    return reinterpret_cast<jlong>(region);

}