OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a00f847 da0b2ce)
am da0b2ce3: (-s ours) am 02022b70: Merge "media: fix estimateFrameRatesFor to use...
authorRonghua Wu <ronghuawu@google.com>
Thu, 27 Aug 2015 09:20:50 +0000 (09:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:20:50 +0000 (09:20 +0000)
* commit 'da0b2ce39ccc0eb2042cf601ff89883f67b4fa10':


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