OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
556c93c
7f9551f
)
am 7f9551f7: MediaMuxer: Hook up setLocation method
author
Zhijun He
<zhijunhe@google.com>
Tue, 10 Sep 2013 19:02:54 +0000
(12:02 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 10 Sep 2013 19:02:54 +0000
(12:02 -0700)
* commit '
7f9551f75eedb3e4e1fe8feaaba48d8080635fc4
':
MediaMuxer: Hook up setLocation method
Trivial merge