commit 9e0fcdb41238363d78b7fd9bef4124f84a9a4590
author Sunny Goyal <sunnygoyal@google.com> Thu Jul 02 00:37:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 02 00:37:12 2015 +0000
tree 00e0aca5ea9712655b9c972369df6aa5005b70d1
parent 487c4aa33471876e3e30c7b1cde90ae577572cfc
parent 1d8f4ad59dbb17d80c6b910be8ad85904cb08d68

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 '1d8f4ad59dbb17d80c6b910be8ad85904cb08d68':
  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";