resolve merge conflicts of 1933e5c645e6 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iabfe52a42f4a5ced3dba225cb137b844f9050a0a
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index 615d3c4..f02631c 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -722,7 +722,7 @@
}
/**
- * Detect when an {@link java.io.Closeable} or other object with a explict termination
+ * Detect when an {@link java.io.Closeable} or other object with an explicit termination
* method is finalized without having been closed.
*
* <p>You always want to explicitly close such objects to avoid unnecessary resources