summaryrefslogtreecommitdiffstats
path: root/protos
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-07-02 00:37:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-02 00:37:12 +0000
commit9e0fcdb41238363d78b7fd9bef4124f84a9a4590 (patch)
tree00e0aca5ea9712655b9c972369df6aa5005b70d1 /protos
parent487c4aa33471876e3e30c7b1cde90ae577572cfc (diff)
parent1d8f4ad59dbb17d80c6b910be8ad85904cb08d68 (diff)
downloadandroid_packages_apps_Trebuchet-9e0fcdb41238363d78b7fd9bef4124f84a9a4590.tar.gz
android_packages_apps_Trebuchet-9e0fcdb41238363d78b7fd9bef4124f84a9a4590.tar.bz2
android_packages_apps_Trebuchet-9e0fcdb41238363d78b7fd9bef4124f84a9a4590.zip
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."
Diffstat (limited to 'protos')
-rw-r--r--protos/backup.proto1
1 files changed, 0 insertions, 1 deletions
diff --git a/protos/backup.proto b/protos/backup.proto
index 3cd0b8230..09330ee06 100644
--- a/protos/backup.proto
+++ b/protos/backup.proto
@@ -18,7 +18,6 @@ syntax = "proto2";
package launcher_backup;
-option javanano_use_deprecated_package = true;
option java_package = "com.android.launcher3.backup";
option java_outer_classname = "BackupProtos";