resolve merge conflicts of 79cf158c to mnc-dev

    return OK;

    return OK;

}

}

status_t RTPSender::parseAPP(const uint8_t *data, size_t size __unused) {

status_t RTPSender::parseAPP(const uint8_t *data, size_t size) {

    if (!memcmp("late", &data[8], 4)) {

    static const size_t late_offset = 8;

        int64_t avgLatencyUs = (int64_t)U64_AT(&data[12]);

    static const char late_string[] = "late";

        int64_t maxLatencyUs = (int64_t)U64_AT(&data[20]);

    static const size_t avgLatencyUs_offset = late_offset + sizeof(late_string) - 1;

    static const size_t maxLatencyUs_offset = avgLatencyUs_offset + sizeof(int64_t);

    if ((size >= (maxLatencyUs_offset + sizeof(int64_t)))

            && !memcmp(late_string, &data[late_offset], sizeof(late_string) - 1)) {

        int64_t avgLatencyUs = (int64_t)U64_AT(&data[avgLatencyUs_offset]);

        int64_t maxLatencyUs = (int64_t)U64_AT(&data[maxLatencyUs_offset]);

        sp<AMessage> notify = mNotify->dup();

        sp<AMessage> notify = mNotify->dup();

        notify->setInt32("what", kWhatInformSender);

        notify->setInt32("what", kWhatInformSender);