From 4dac494ece9d30c060af6a179340267a24d2730b Mon Sep 17 00:00:00 2001
From: Tamas Berghammer <tberghammer@google.com>
Date: Wed, 18 Jan 2017 16:17:32 +0000
Subject: [PATCH] DO NOT MERGE: Revert "Update package names to work with the
 proto3 compiler"

This reverts commit 0c0c8f782512d81aa9e6fda0788047499e53e3b3.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
---
 .../server/connectivity/IpConnectivityEventBuilderTest.java     | 2 +-
 .../android/server/connectivity/IpConnectivityMetricsTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityEventBuilderTest.java
index fc62d2af84..aed3635245 100644
--- a/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityEventBuilderTest.java
+++ b/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityEventBuilderTest.java
@@ -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;
diff --git a/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityMetricsTest.java b/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityMetricsTest.java
index e5ad3f01f4..3fc89b9ff1 100644
--- a/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityMetricsTest.java
+++ b/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityMetricsTest.java
@@ -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;