OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e99a269 e7004a7)
am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworkte...
authorYu Shan Emily Lau <yslau@google.com>
Tue, 25 Aug 2009 17:42:02 +0000 (10:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2009 17:42:02 +0000 (10:42 -0700)
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair

* commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8':
  Revert " modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"


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