Merge branch 'master' into sdk
authorHeeJu Kang <mobum.kang@samsung.com>
Thu, 3 Jan 2013 07:53:23 +0000 (16:53 +0900)
committerHeeJu Kang <mobum.kang@samsung.com>
Thu, 3 Jan 2013 07:53:31 +0000 (16:53 +0900)
commit301b9b96333f69b565554c70c371ed07f8f4ea55
treefe2eb64918c1f3a843bffff944e6073c550b9ebc
parent8c647fd18b435a94f5ffcad8a073d1e7a1443376
parent014a4a23bb3d27b1cdc0df654074e527d81db2af
Merge branch 'master' into sdk

Change-Id: I8e86670b1bc8981f1e47bad5c87138bb59278b4d