am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."

* commit '7a800e7982ff607aa339f44742de935033f38cfe':
  Avoid leaking AssetFileDescriptor.

java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java

@@ -95,8 +95,16 @@ final class BinaryDictionaryGetter {
                     + fallbackResId);
             return null;
         }
-        return AssetFileAddress.makeFromFileNameAndOffset(
-                context.getApplicationInfo().sourceDir, afd.getStartOffset(), afd.getLength());
+        try {
+            return AssetFileAddress.makeFromFileNameAndOffset(
+                    context.getApplicationInfo().sourceDir, afd.getStartOffset(), afd.getLength());
+        } finally {
+            try {
+                afd.close();
+            } catch (IOException e) {
+                // Ignored
+            }
+        }
     }
 
     private static final class DictPackSettings {