DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

This reverts commit 0c0c8f7825.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
This commit is contained in:
Tamas Berghammer
2017-01-18 16:17:32 +00:00
parent 0c0c8f7825
commit 4dac494ece
2 changed files with 2 additions and 2 deletions

View File

@@ -32,7 +32,7 @@ import com.google.protobuf.nano.MessageNano;
import java.util.Arrays;
import junit.framework.TestCase;
import static com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityLog;
import static com.android.server.connectivity.metrics.IpConnectivityLogClass.IpConnectivityLog;
import static com.android.server.connectivity.MetricsTestUtil.aBool;
import static com.android.server.connectivity.MetricsTestUtil.aByteArray;
import static com.android.server.connectivity.MetricsTestUtil.aLong;

View File

@@ -29,7 +29,7 @@ import android.net.metrics.RaEvent;
import android.net.metrics.ValidationProbeEvent;
import android.os.Parcelable;
import android.util.Base64;
import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass;
import com.android.server.connectivity.metrics.IpConnectivityLogClass;
import com.google.protobuf.nano.MessageNano;
import java.io.PrintWriter;
import java.io.StringWriter;