commit 519a40f731b747f1248a7443d4b5ab152572975a
author Adam Cohen <adamcohen@google.com> Fri Jul 31 21:10:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 31 21:10:14 2015 +0000
tree 4c6edd8323a7b1829054d9a48817fd9d71bb2e50
parent e990d49534bb61606bcf3e61fa3c26e088d1b854
parent a547c4516c1a2dfd87f3466fccffd5ca6c5cab8c

am a547c451: Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage"

* commit 'a547c4516c1a2dfd87f3466fccffd5ca6c5cab8c':
  Revert "Add proto flag "javanano_use_deprecated_package" to avoid build breakage"

protos/backup.proto

diff --git a/protos/backup.proto b/protos/backup.proto
index b7ad5ef..6704e08 100644
--- a/protos/backup.proto
+++ b/protos/backup.proto
@@ -18,7 +18,6 @@
 
 package launcher_backup;
 
-option javanano_use_deprecated_package = true;
 option java_package = "com.android.launcher3.backup";
 option java_outer_classname = "BackupProtos";