Snap for 8512216 from 1458fead2c526204545d7be496a6baab5603ded6 to tm-frc-resolv-releaset_frc_res_330443000android13-frc-resolv-release

Change-Id: I47ca5d9d004b32a07b74e6bf2b626497bbde8989

5 files changed, 26 insertions, 13 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 2d96982..9712a81 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,6 @@
 {
   "git": {
-    "sha1": "ef27875e0311786ca5210a734c6288cb5d920614"
-  }
-}
+    "sha1": "d0d238d880276fd617c38f7e4712bf40db58aad6"
+  },
+  "path_in_vcs": "derive"
+}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 6ff242f..b3caae1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,7 +43,7 @@ rust_proc_macro {
     name: "libderive_arbitrary",
     crate_name: "derive_arbitrary",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.2",
+    cargo_pkg_version: "1.1.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
diff --git a/Cargo.toml b/Cargo.toml
index 0bf12a0..d749034 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,18 +12,30 @@
 [package]
 edition = "2018"
 name = "derive_arbitrary"
-version = "1.0.2"
-authors = ["The Rust-Fuzz Project Developers", "Nick Fitzgerald <fitzgen@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>", "Andre Bogus <bogusandre@gmail.com>", "Corey Farwell <coreyf@rwell.org>"]
+version = "1.1.0"
+authors = [
+    "The Rust-Fuzz Project Developers",
+    "Nick Fitzgerald <fitzgen@gmail.com>",
+    "Manish Goregaokar <manishsmail@gmail.com>",
+    "Andre Bogus <bogusandre@gmail.com>",
+    "Corey Farwell <coreyf@rwell.org>",
+]
 description = "Derives arbitrary traits"
 documentation = "https://docs.rs/arbitrary/"
 readme = "README.md"
-keywords = ["arbitrary", "testing", "derive", "macro"]
+keywords = [
+    "arbitrary",
+    "testing",
+    "derive",
+    "macro",
+]
 categories = ["development-tools::testing"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-fuzz/arbitrary"
 
 [lib]
 proc_macro = true
+
 [dependencies.proc-macro2]
 version = "1.0"
 
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 8b7ce1a..acdd379 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "derive_arbitrary"
-version = "1.0.2" # Make sure it matches the version of the arbitrary crate itself.
+version = "1.1.0" # Make sure it matches the version of the arbitrary crate itself.
 authors = [
     "The Rust-Fuzz Project Developers",
     "Nick Fitzgerald <fitzgen@gmail.com>",
diff --git a/METADATA b/METADATA
index 657b085..f875682 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/derive_arbitrary/derive_arbitrary-1.0.2.crate"
+    value: "https://static.crates.io/crates/derive_arbitrary/derive_arbitrary-1.1.0.crate"
   }
-  version: "1.0.2"
+  version: "1.1.0"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2021
-    month: 9
-    day: 22
+    year: 2022
+    month: 3
+    day: 1
   }
 }