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