From 5221dcbe479ed765d8103ed7601c69b6d8d6ca4f Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Fri, 29 Jan 2016 13:51:05 -0800
Subject: Integrate from google internal.

Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
---
 java/lite/pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'java/lite/pom.xml')

diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index 29d8c8c4..70c7d047 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -84,7 +84,6 @@
             <include>**/AbstractMessageLite.java</include>
             <include>**/AbstractParser.java</include>
             <include>**/AbstractProtobufList.java</include>
-            <include>**/BoundedByteString.java</include>
             <include>**/BooleanArrayList.java</include>
             <include>**/ByteString.java</include>
             <include>**/CodedInputStream.java</include>
@@ -101,7 +100,6 @@
             <include>**/LazyFieldLite.java</include>
             <include>**/LazyStringArrayList.java</include>
             <include>**/LazyStringList.java</include>
-            <include>**/LiteralByteString.java</include>
             <include>**/LongArrayList.java</include>
             <include>**/MapEntryLite.java</include>
             <include>**/MapFieldLite.java</include>
@@ -119,7 +117,7 @@
             <include>**/UninitializedMessageException.java</include>
             <include>**/UnknownFieldSetLite.java</include>
             <include>**/UnmodifiableLazyStringList.java</include>
-            <include>**/UnsafeByteStrings.java</include>
+            <include>**/UnsafeByteOperations.java</include>
             <include>**/Utf8.java</include>
             <include>**/WireFormat.java</include>
           </includes>
-- 
cgit v1.2.3