Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d25bd9f4 authored by Kurt Nelson's avatar Kurt Nelson
Browse files

resolve merge conflicts of 1933e5c6 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iabfe52a42f4a5ced3dba225cb137b844f9050a0a
parents e44481f7 1933e5c6

core/java/android/os/StrictMode.java

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ public final class StrictMode { 
            }



            /**

             * 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