commit a86c98880763be8d931e6caf3a761cc26cc11896
author Adam Cohen <adamcohen@google.com> Fri Jul 31 21:13:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 31 21:13:34 2015 +0000
tree aa80ae75d9b61a1d8ba04270d47e487d91b5900a
parent 149366284918692c6dc05b7a1deb19a4e7585070
parent 519a40f731b747f1248a7443d4b5ab152572975a

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

* commit '519a40f731b747f1248a7443d4b5ab152572975a':
  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";