# HG changeset patch # User William Roberts # Date 1268572549 0 # Node ID 608b0be494d88140ddfe77de095cc599638afc78 # Parent 24f5986762de3878b27897dba302658355969eb4# Parent f7d9134af83e96f04f9e73e8e3b8755491fda69d Automatic merge from PDK_3.0.h diff -r f7d9134af83e -r 608b0be494d8 mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/test3gp.dcf diff -r f7d9134af83e -r 608b0be494d8 mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testmp3.dcf