summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jon Dormody <jond@google.com> 2017-12-01 16:28:14 +0000
committer android-build-merger <android-build-merger@google.com> 2017-12-01 16:28:14 +0000
commit96dad7e0a3404d1cb5cb8ec9256bb1254405e07e (patch)
tree418b6f1b95f5ee3b08ebead58e98806e62e8f7c0
parent37db2694eb6f345958db1a99f64f141aa06a13db (diff)
parent3ba37e1f53ae922061a2d4ec7a5e835b030eeb0f (diff)
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev am: ce7f1e6601
am: 3ba37e1f53 Change-Id: Ia807c8ccd0db5b37b010f64a417fc8e105c22866
-rw-r--r--core/java/android/content/res/AssetFileDescriptor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/res/AssetFileDescriptor.java b/core/java/android/content/res/AssetFileDescriptor.java
index 28edde0250cf..be4103622b11 100644
--- a/core/java/android/content/res/AssetFileDescriptor.java
+++ b/core/java/android/content/res/AssetFileDescriptor.java
@@ -195,7 +195,7 @@ public class AssetFileDescriptor implements Parcelable, Closeable {
/**
* An InputStream you can create on a ParcelFileDescriptor, which will
* take care of calling {@link ParcelFileDescriptor#close
- * ParcelFileDescritor.close()} for you when the stream is closed.
+ * ParcelFileDescriptor.close()} for you when the stream is closed.
*/
public static class AutoCloseInputStream
extends ParcelFileDescriptor.AutoCloseInputStream {
@@ -282,7 +282,7 @@ public class AssetFileDescriptor implements Parcelable, Closeable {
/**
* An OutputStream you can create on a ParcelFileDescriptor, which will
* take care of calling {@link ParcelFileDescriptor#close
- * ParcelFileDescritor.close()} for you when the stream is closed.
+ * ParcelFileDescriptor.close()} for you when the stream is closed.
*/
public static class AutoCloseOutputStream
extends ParcelFileDescriptor.AutoCloseOutputStream {