Merge "Remove sergeynv@google.com from core/java/android/os/storage/OWNERS" into main
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index 920cc57..0897f85 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -2772,13 +2772,14 @@
}
/**
- * If rollback enabled for this session (via {@link #setEnableRollback}, set time
- * after which rollback will no longer be possible
+ * If rollback enabled for this session (via {@link #setEnableRollback}, set period
+ * after which rollback files will be deleted due to expiration
+ * {@link RollbackManagerServiceImpl#deleteRollback}.
*
* <p>For multi-package installs, this value must be set on the parent session.
* Child session rollback lifetime will be ignored.
*
- * @param lifetimeMillis time after which rollback expires
+ * @param lifetimeMillis period after which rollback expires
* @throws IllegalArgumentException if lifetimeMillis is negative or rollback is not
* enabled via setEnableRollback.
* @hide
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/OWNERS b/packages/SystemUI/src/com/android/systemui/statusbar/tv/OWNERS
index a601e9b..0b9f559 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/OWNERS
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/OWNERS
@@ -4,5 +4,4 @@
galinap@google.com
patrikf@google.com
robhor@google.com
-sergeynv@google.com