am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related...

* commit '797b5adcb4ead3c687db3d9fd831dff93760dd4a':
  AArch64: Make AssetManager and related classes 64-bit compatible

diff --cc core/java/android/content/res/AssetManager.java
index 8944dcb,780c4be..276e19b
--- 1/core/java/android/content/res/AssetManager.java
--- 2/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@@ -535,11 -536,8 +535,11 @@@ public final class AssetManager 
      }
      
      public final class AssetInputStream extends InputStream {
 +        /**
 +         * @hide
 +         */
          public final int getAssetInt() {
-             return mAsset;
+             return (int) mAsset;
          }
          /**
           * @hide

diff --cc core/java/android/content/res/Resources.java
Simple merge