OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6be7f2 8b8e5d4)
am 8b8e5d45: (-s ours) resolved conflicts for merge of cbd74fcb to klp-modular-dev...
authorNarayan Kamath <narayan@google.com>
Fri, 13 Jun 2014 10:32:14 +0000 (10:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Jun 2014 10:32:14 +0000 (10:32 +0000)
* commit '8b8e5d45928aed8592d321fe55f560e35a4fece8':
  Update OMX messages for 64 bit


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