diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-14 02:16:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-14 02:16:39 -0800 |
| commit | 80b0496abeb03fe4c5086430218c7e4bcf3773db (patch) | |
| tree | c3b76ee1b21d86e0b063d18565f0be0aaa437dab /core/java | |
| parent | 271b28ac3121e8bcc46e15bd15b13bfbc1e1be89 (diff) | |
| parent | 2db26788ab367f08cb5378d77e22e8939e7a28c2 (diff) | |
am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '2db26788ab367f08cb5378d77e22e8939e7a28c2':
Revert "Hide AssetInputStream.getAssetInt."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index d38559fdf110..fc9e48661815 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -537,9 +537,6 @@ public final class AssetManager { } public final class AssetInputStream extends InputStream { - /** - * @hide - */ public final int getAssetInt() { return mAsset; } |