diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-14 02:13:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-14 02:13:45 -0800 |
| commit | 2db26788ab367f08cb5378d77e22e8939e7a28c2 (patch) | |
| tree | 8db7f8ee490afb255539ebbaff3756a662362100 /core/java/android | |
| parent | 8021316010fb4bd18a29751949eb2cda66199b6e (diff) | |
| parent | e71afc2ea72e98c4631e79cad65f678090da87d3 (diff) | |
am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit 'e71afc2ea72e98c4631e79cad65f678090da87d3':
Revert "Hide AssetInputStream.getAssetInt."
Diffstat (limited to 'core/java/android')
| -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; } |