Merge "Cleanup testOverrideVendorId static member after running unittest."

import com.android.internal.util.HexDump;

import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

        DhcpPacket.testOverrideVendorId = "android-dhcp-???";

    }

    @After

    public void tearDown() {

        DhcpPacket.testOverrideVendorId = null;

    }

    class TestDhcpPacket extends DhcpPacket {

        private byte mType;

        // TODO: Make this a map of option numbers to bytes instead.