From 017399027ed5d7368d44805afdaa1d5b64ec09be Mon Sep 17 00:00:00 2001
From: Carl Mastrangelo <notcarl@google.com>
Date: Mon, 30 Apr 2018 11:31:10 -0700
Subject: [PATCH] android-interop-testing: normalize integration proto
 directories

---
 .../grpc/android/integrationtest => grpc/testing}/empty.proto | 0
 .../android/integrationtest => grpc/testing}/messages.proto   | 0
 .../grpc/android/integrationtest => grpc/testing}/test.proto  | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename android-interop-testing/app/src/main/proto/{io/grpc/android/integrationtest => grpc/testing}/empty.proto (100%)
 rename android-interop-testing/app/src/main/proto/{io/grpc/android/integrationtest => grpc/testing}/messages.proto (100%)
 rename android-interop-testing/app/src/main/proto/{io/grpc/android/integrationtest => grpc/testing}/test.proto (95%)

diff --git a/android-interop-testing/app/src/main/proto/io/grpc/android/integrationtest/empty.proto b/android-interop-testing/app/src/main/proto/grpc/testing/empty.proto
similarity index 100%
rename from android-interop-testing/app/src/main/proto/io/grpc/android/integrationtest/empty.proto
rename to android-interop-testing/app/src/main/proto/grpc/testing/empty.proto
diff --git a/android-interop-testing/app/src/main/proto/io/grpc/android/integrationtest/messages.proto b/android-interop-testing/app/src/main/proto/grpc/testing/messages.proto
similarity index 100%
rename from android-interop-testing/app/src/main/proto/io/grpc/android/integrationtest/messages.proto
rename to android-interop-testing/app/src/main/proto/grpc/testing/messages.proto
diff --git a/android-interop-testing/app/src/main/proto/io/grpc/android/integrationtest/test.proto b/android-interop-testing/app/src/main/proto/grpc/testing/test.proto
similarity index 95%
rename from android-interop-testing/app/src/main/proto/io/grpc/android/integrationtest/test.proto
rename to android-interop-testing/app/src/main/proto/grpc/testing/test.proto
index c351cbabbb..8dce985d1c 100644
--- a/android-interop-testing/app/src/main/proto/io/grpc/android/integrationtest/test.proto
+++ b/android-interop-testing/app/src/main/proto/grpc/testing/test.proto
@@ -17,8 +17,8 @@
 // of unary/streaming requests/responses.
 syntax = "proto3";
 
-import "io/grpc/android/integrationtest/empty.proto";
-import "io/grpc/android/integrationtest/messages.proto";
+import "grpc/testing/empty.proto";
+import "grpc/testing/messages.proto";
 
 package grpc.testing;