am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""

* commit 'd34950cfc66e258caba14c7ddc553028647898f1':
  Revert "Hide AssetInputStream.getAssetInt."

2 files changed, 1 insertions, 3 deletions

diff --git a/api/current.txt b/api/current.txt
index 9b8a62c4feb1..38482423bc2e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7551,6 +7551,7 @@ package android.content.res {
   public final class AssetManager.AssetInputStream extends java.io.InputStream {
     method public final int available() throws java.io.IOException;
     method public final void close() throws java.io.IOException;
+    method public final int getAssetInt();
     method public final void mark(int);
     method public final boolean markSupported();
     method public final int read() throws java.io.IOException;
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;
         }