Merge branch 'master' into crashlytics-freeram

Author: mrober

firebase-firestore/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
-* [feature] Add option to allow SDK create cache indexes automatically to improve query execution locally. [`db.getPersistentCacheIndexManager().enableIndexAutoCreation()`](//github.com/firebase/firebase-android-sdk/pull/4987)
+* [feature] Add the option to allow the SDK to create cache indexes automatically to
+  improve query execution locally. [`db.getPersistentCacheIndexManager().enableIndexAutoCreation()`](//github.com/firebase/firebase-android-sdk/pull/4987)
 
 # 24.7.1
 * [fixed] Implement equals method on Filter class. [#5210](//github.com/firebase/firebase-android-sdk/issues/5210)

firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java

@@ -356,8 +356,8 @@ public FirebaseApp getApp() {
    * @return A task that resolves once all indices are successfully configured.
    * @throws IllegalArgumentException if the JSON format is invalid
    * @deprecated Instead of creating cache indexes manually, consider using {@link
-   *     PersistentCacheIndexManager#enableIndexAutoCreation()} to let SDK decide whether to create
-   *     cache indexes for queries running locally.
+   *     PersistentCacheIndexManager#enableIndexAutoCreation()} to let the SDK decide whether to
+   *     create cache indexes for queries running locally.
    */
   @Deprecated
   @PreviewApi

firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheIndexManager.java

@@ -52,8 +52,8 @@ public void disableIndexAutoCreation() {
   }
 
   /**
-   * Removes all persistent cache indexes. Please note this function will also deletes indexes
-   * generated by {@link FirebaseFirestore#setIndexConfiguration(String)}, which is deprecated.
+   * Removes all persistent cache indexes. Please note this function also deletes indexes generated
+   * by {@link FirebaseFirestore#setIndexConfiguration(String)}, which is deprecated.
    */
   public void deleteAllIndexes() {
     client.deleteAllFieldIndexes();