commit 80b0496abeb03fe4c5086430218c7e4bcf3773db
author Narayan Kamath <narayan@google.com> Tue Jan 14 02:16:39 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 14 02:16:39 2014 -0800
tree c3b76ee1b21d86e0b063d18565f0be0aaa437dab
parent 271b28ac3121e8bcc46e15bd15b13bfbc1e1be89
parent 2db26788ab367f08cb5378d77e22e8939e7a28c2

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

* commit '2db26788ab367f08cb5378d77e22e8939e7a28c2':
  Revert "Hide AssetInputStream.getAssetInt."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index aa7b107..2bd9c05 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7543,6 +7543,7 @@
   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

diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index d38559f..fc9e486 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -537,9 +537,6 @@
     }
     
     public final class AssetInputStream extends InputStream {
-        /**
-         * @hide
-         */
         public final int getAssetInt() {
             return mAsset;
         }