am cb767411: Add proto flag "javanano_use_deprecated_package" to avoid build breakage

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

diff --combined protos/backup.proto
index 6704e08,e1af696..b7ad5ef
--- 1/protos/backup.proto
--- 2/protos/backup.proto
+++ b/protos/backup.proto
@@@ -18,6 -18,7 +18,7 @@@ syntax = "proto2"
  
  package launcher_backup;
  
+ option javanano_use_deprecated_package = true;
  option java_package = "com.android.launcher3.backup";
  option java_outer_classname = "BackupProtos";
  
@@@ -72,17 -73,6 +73,17 @@@ message Journal 
  }
  
  message Favorite {
 +  // Type of the app, this target represents
 +  enum TargetType {
 +    TARGET_NONE = 0;
 +    TARGET_PHONE = 1;
 +    TARGET_MESSENGER = 2;
 +    TARGET_EMAIL = 3;
 +    TARGET_BROWSER = 4;
 +    TARGET_GALLERY = 5;
 +    TARGET_CAMERA = 6;
 +  }
 +
    required int64 id = 1;
    required int32 itemType = 2;
    optional string title = 3;
@@@ -101,10 -91,6 +102,10 @@@
    optional string iconPackage = 16;
    optional string iconResource = 17;
    optional bytes icon = 18;
 +
 +  // Added in backup version 4
 +  optional TargetType targetType = 19 [default = TARGET_NONE];
 +  optional int32 rank = 20;
  }
  
  message Screen {
@@@ -124,7 -110,6 +125,7 @@@ message Widget 
    optional Resource icon = 4;
    optional Resource preview = 5;
  
 +  // Added in backup version 3
    // Assume that a widget is resizable upto 2x2 if no data is available
    optional int32 minSpanX = 6 [default = 2];
    optional int32 minSpanY = 7 [default = 2];