am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""

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

api/current.txt

@@ -7543,6 +7543,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;

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;
         }