OSDN Git Service

am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id5408...
authorNarayan Kamath <narayan@google.com>
Thu, 16 Jan 2014 15:57:47 +0000 (15:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jan 2014 15:57:47 +0000 (15:57 +0000)
commit6606d16e097480e061546306cc95a729f5dccae8
tree8eec8ce5ec5dc334c1ca01d45a5f63ce944673cd
parenta3340da7d4ef3872bd1191fcd4bf8b25d1179a25
parent6706888e24aee04c2c914c44e5ef5b1510cf8013
am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68

* commit '6706888e24aee04c2c914c44e5ef5b1510cf8013':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
core/java/android/content/res/AssetManager.java
core/jni/android/graphics/BitmapRegionDecoder.cpp
core/jni/android/graphics/Graphics.cpp
core/jni/android/graphics/Movie.cpp