Merge with private GIT
authoryanjie.hu <yanjie.hu@samsung.com>
Thu, 21 Mar 2013 08:58:19 +0000 (16:58 +0800)
committeryanjie.hu <yanjie.hu@samsung.com>
Thu, 21 Mar 2013 08:58:19 +0000 (16:58 +0800)
commitb335fe38c7042ab91844cb4869caf254c0882ff3
treeb3df24501628ab7463f92bc84e432494e0d8851c
parentd4fd7807d2523b9ab6c368aa9c3dba28710cf0cb
Merge with private GIT

Change-Id: I32d27312a55a465bd38c455cd8333faafa44ea50
scl/sclresourcecache.cpp
xmlresource/input_mode_configure_parser.cpp