Snap for 7269134 from 710beab0532ccece1055fb39c39509c17e68f6f3 to sc-mainline-release

Change-Id: I666eef48f74e9b5ad8d8cc4119f14b178795a0bc
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 054c2ae..0342b7b 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "229fe94bdfa35ed20d16e7548441c0009060a8cd"
+    "sha1": "08adaa5fbfcc4aae019a15068f3ae56a3fe7a877"
   }
 }
diff --git a/Android.bp b/Android.bp
index ca96411..4644343 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --dependencies --features=.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_zip_license"],
@@ -31,12 +32,12 @@
 }
 
 // dependent_library ["feature_list"]
-//   byteorder-1.4.2 "default,std"
+//   byteorder-1.4.3 "default,std"
 //   cfg-if-1.0.0
 //   crc32fast-1.2.1 "default,std"
-//   proc-macro2-1.0.24 "default,proc-macro"
-//   quote-1.0.8 "default,proc-macro"
-//   syn-1.0.60 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-//   thiserror-1.0.23
-//   thiserror-impl-1.0.23
+//   proc-macro2-1.0.26 "default,proc-macro"
+//   quote-1.0.9 "default,proc-macro"
+//   syn-1.0.68 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   thiserror-1.0.24
+//   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/Cargo.toml b/Cargo.toml
index fef317a..7831bc5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,13 +13,12 @@
 [package]
 edition = "2018"
 name = "zip"
-version = "0.5.9"
-authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>"]
+version = "0.5.11"
+authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>", "Marli Frost <marli@frost.red>", "Ryan Levick <ryan.levick@gmail.com>"]
 description = "Library to support the reading and writing of zip files.\n"
-documentation = "http://mvdnes.github.io/rust-docs/zip-rs/zip/index.html"
 keywords = ["zip", "archive"]
 license = "MIT"
-repository = "https://github.com/mvdnes/zip-rs.git"
+repository = "https://github.com/zip-rs/zip.git"
 
 [[bench]]
 name = "read_entry"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index f063a92..68fe4ca 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,10 +1,9 @@
 [package]
 name = "zip"
-version = "0.5.9"
-authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>"]
+version = "0.5.11"
+authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>", "Marli Frost <marli@frost.red>", "Ryan Levick <ryan.levick@gmail.com>"]
 license = "MIT"
-repository = "https://github.com/mvdnes/zip-rs.git"
-documentation = "http://mvdnes.github.io/rust-docs/zip-rs/zip/index.html"
+repository = "https://github.com/zip-rs/zip.git"
 keywords = ["zip", "archive"]
 description = """
 Library to support the reading and writing of zip files.
diff --git a/METADATA b/METADATA
index 3679dc8..c0a206d 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/zip/zip-0.5.9.crate"
+    value: "https://static.crates.io/crates/zip/zip-0.5.11.crate"
   }
-  version: "0.5.9"
+  version: "0.5.11"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 2
-    day: 6
+    month: 4
+    day: 1
   }
 }
diff --git a/README.md b/README.md
index c386363..79d2dcc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Build Status](https://img.shields.io/github/workflow/status/zip-rs/zip/CI)](https://github.com/zip-rs/zip/actions?query=branch%3Amaster+workflow%3ACI)
 [![Crates.io version](https://img.shields.io/crates/v/zip.svg)](https://crates.io/crates/zip)
 
-[Documentation](http://mvdnes.github.io/rust-docs/zip-rs/zip/index.html)
+[Documentation](https://docs.rs/zip/0.5.10/zip/)
 
 
 Info
diff --git a/script/doc-upload.cfg b/script/doc-upload.cfg
deleted file mode 100644
index cd512ba..0000000
--- a/script/doc-upload.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-PROJECT_NAME=zip-rs
-DOCS_REPO=mvdnes/rust-docs.git
-DOC_RUST_VERSION=stable
diff --git a/src/types.rs b/src/types.rs
index f468402..154e3c2 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -30,7 +30,7 @@
 /// # Warning
 ///
 /// Some utilities use alternative timestamps to improve the accuracy of their
-/// ZIPs, but we don't parse them yet. [We're working on this](https://github.com/mvdnes/zip-rs/issues/156#issuecomment-652981904),
+/// ZIPs, but we don't parse them yet. [We're working on this](https://github.com/zip-rs/zip/issues/156#issuecomment-652981904),
 /// however this API shouldn't be considered complete.
 #[derive(Debug, Clone, Copy)]
 pub struct DateTime {