OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7163e09 b660857)
am b6608575: Merge "Resolved conflicts for merge of 28c6ec02 to master"
authorNarayan Kamath <narayan@google.com>
Thu, 16 Jan 2014 15:59:28 +0000 (07:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jan 2014 15:59:28 +0000 (07:59 -0800)
* commit 'b66085750ec4e8c4a2abab241ebcbf7edbfe469c':
  AArch64: Use long for pointers in media classes


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