am 21e57216: Merge "Fix a possible NPE in Dicttool"

package android.util;

import java.util.Arrays;

import java.util.Objects;

public class Pair<T1, T2> {

    public final T1 mFirst;

    @Override

    public int hashCode() {

        return Arrays.hashCode(new Object[] { mFirst, mSecond });

        return (mFirst == null ? 0 : mFirst.hashCode())

                ^ (mSecond == null ? 0 : mSecond.hashCode());

    }

    @Override

        if (o == this) return true;

        if (!(o instanceof Pair)) return false;

        Pair<?, ?> p = (Pair<?, ?>)o;

        return ((mFirst == null && p.mFirst == null) || mFirst.equals(p.mFirst))

                && ((mSecond == null && p.mSecond == null) || mSecond.equals(p.mSecond));

        return Objects.equals(mFirst, p.mFirst) && Objects.equals(mSecond, p.mSecond);

    }

}