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:
c16d693
e7004a7
)
am 8c937a17: Merge change 22379 into donut
author
Yu Shan Emily Lau
<yslau@google.com>
Mon, 24 Aug 2009 17:14:25 +0000
(10:14 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 24 Aug 2009 17:14:25 +0000
(10:14 -0700)
Merge commit '
8c937a17667704ee9ba60663f4c4b76f3c3a0f78
' into eclair
* commit '
8c937a17667704ee9ba60663f4c4b76f3c3a0f78
':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Trivial merge