OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b7dde9
e06a174
)
am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
author
Jamie Gennis
<jgennis@google.com>
Wed, 30 Nov 2011 01:26:32 +0000
(17:26 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 30 Nov 2011 01:26:32 +0000
(17:26 -0800)
* commit '
6f1dd757cb158d17c76baeb170f7db2271802ef8
':
SurfaceMediaSource: use the vid enc usage bit
Trivial merge