# HG changeset patch # User Pat Downey # Date 1277381938 -3600 # Node ID 844a5921f85beb251e6b22c42379a213603fb28d # Parent 84197e66a4bdaa5c87209542c8357f2bde8b3b42# Parent da93fe14e0e34cead356ab53d27b48fd3003e1cb Merge redundant head. diff -r 84197e66a4bd -r 844a5921f85b layers.sysdef.xml diff -r 84197e66a4bd -r 844a5921f85b msg_plat/messaging_media_resolver_api/inc/MsgAudioInfo.h diff -r 84197e66a4bd -r 844a5921f85b msg_plat/messaging_media_resolver_api/inc/MsgImageInfo.h diff -r 84197e66a4bd -r 844a5921f85b msg_plat/messaging_media_resolver_api/inc/MsgMediaInfo.h diff -r 84197e66a4bd -r 844a5921f85b msg_plat/messaging_media_resolver_api/inc/MsgMediaResolver.h diff -r 84197e66a4bd -r 844a5921f85b msg_plat/messaging_media_resolver_api/inc/MsgTextInfo.h diff -r 84197e66a4bd -r 844a5921f85b msg_plat/messaging_media_resolver_api/inc/MsgVideoInfo.h diff -r 84197e66a4bd -r 844a5921f85b msg_plat/mms_conformance_api/inc/MmsConformance.h diff -r 84197e66a4bd -r 844a5921f85b msg_plat/mms_engine_settings_api/inc/MmsEngineInternalCRKeys.h