Merge "docs: fix typo" into qt-dev am: 4fa49b4541 am: 5cc0a67503

am: ffbebe1fde

Change-Id: I2e9a580dad500431c1eca2aabed8d2c723009bd4

core/java/android/content/SyncStats.java

@@ -58,7 +58,7 @@ public class SyncStats implements Parcelable {
      * attempted to update or delete a version of a resource on the server. This is expected
      * to clear itself automatically once the new state is retrieved from the server,
      * though it may remain until the user intervenes manually, perhaps by clearing the
-     * local storage and starting over frmo scratch. This is considered a hard error.
+     * local storage and starting over from scratch. This is considered a hard error.
      */
     public long numConflictDetectedExceptions;