Merge "Fix signature for finalize() to resolve API Lint error" am: 28dc8a29a1

am: c09d405e1d

Change-Id: I1f8915547876e0e0045724eb9a1e29123ab4edda

core/java/android/net/IpSecManager.java

@@ -136,7 +136,7 @@ public final class IpSecManager {
         }
 
         @Override
-        protected void finalize() {
+        protected void finalize() throws Throwable {
             if (mCloseGuard != null) {
                 mCloseGuard.warnIfOpen();
             }