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

This reverts commit 7bcf8af9df8c24687f27fc262764628c4d80ff51.

Change-Id: Ice5f6a295e1d300bf5f39b85052482ef9720de0a
---
 java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java | 3 +--
 proto/polo.proto                                                | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java b/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java
index 50c8035..ea3a7cb 100644
--- a/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java
+++ b/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java
@@ -32,8 +32,7 @@ import com.google.polo.pairing.message.PoloMessage;
 import com.google.polo.pairing.message.SecretAckMessage;
 import com.google.polo.pairing.message.SecretMessage;
 import com.google.polo.wire.PoloWireInterface;
-import com.google.polo.wire.protobuf.nano.PoloProto;
-import com.google.polo.wire.protobuf.nano.PoloProto.OuterMessage;
+import com.google.polo.wire.protobuf.PoloProto.OuterMessage;
 import com.google.protobuf.nano.MessageNano;
 
 import java.io.IOException;
diff --git a/proto/polo.proto b/proto/polo.proto
index fbe95e9..0491439 100644
--- a/proto/polo.proto
+++ b/proto/polo.proto
@@ -2,6 +2,7 @@
 
 package polo.wire.protobuf;
 
+option javanano_use_deprecated_package = true;
 option java_outer_classname = "PoloProto";
 option java_package = "com.google.polo.wire.protobuf";
 option optimize_for = LITE_RUNTIME;
-- 
cgit v1.2.3