OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9160cdf 6606d16)
am 6606d16e: am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge...
authorNarayan Kamath <narayan@google.com>
Thu, 16 Jan 2014 15:59:42 +0000 (07:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jan 2014 15:59:42 +0000 (07:59 -0800)
* commit '6606d16e097480e061546306cc95a729f5dccae8':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help