OSDN Git Service

am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related...
authorNarayan Kamath <narayan@google.com>
Fri, 31 Jan 2014 17:12:42 +0000 (17:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Jan 2014 17:12:42 +0000 (17:12 +0000)
commit90b8eaa68bda6beaf2ff886c3ed642e7050e3ff6
tree94780165587fe6887ec67a4b0036911f2e3ab26e
parent8396b56e0a12d97c7933afca3813c356c18a8f38
parent797b5adcb4ead3c687db3d9fd831dff93760dd4a
am 797b5adc: am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"

* commit '797b5adcb4ead3c687db3d9fd831dff93760dd4a':
  AArch64: Make AssetManager and related classes 64-bit compatible
core/java/android/content/res/AssetManager.java
core/java/android/content/res/Resources.java