summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-08-25 10:42:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-25 10:42:02 -0700
commit523018f1828884e96b1265f3e347410280577945 (patch)
treebc663706abc23092fb416c6dfe517d011e6a36bf /core/jni
parent91ba1c3f9d000928a4ba12d45d609b1c2e7066e7 (diff)
parentb56de7474d93e634f77be58a794fbd1b0e68f6a8 (diff)
downloadframeworks_base-523018f1828884e96b1265f3e347410280577945.zip
frameworks_base-523018f1828884e96b1265f3e347410280577945.tar.gz
frameworks_base-523018f1828884e96b1265f3e347410280577945.tar.bz2
am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair * commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8': Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Diffstat (limited to 'core/jni')
0 files changed, 0 insertions, 0 deletions