commit 6fff250409dbc71775984aa8cdb6b66351e14b0a
author Sunny Goyal <sunnygoyal@google.com> Thu Jul 02 00:48:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 02 00:48:29 2015 +0000
tree ced81858886c85f602cfe94cc88ff367b32c16b1
parent 30546fc0a2e0d0371dd4854d83a73e7a1eda51a8
parent 9e0fcdb41238363d78b7fd9bef4124f84a9a4590

am 9e0fcdb4: am 1d8f4ad5: Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."

* commit '9e0fcdb41238363d78b7fd9bef4124f84a9a4590':
  Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."

protos/backup.proto

diff --git a/protos/backup.proto b/protos/backup.proto
index 3cd0b82..09330ee 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";