Merge remote-tracking branch 'origin/tizen' into da-setting 16/27916/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Tue, 23 Sep 2014 00:59:49 +0000 (09:59 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Tue, 23 Sep 2014 01:00:23 +0000 (10:00 +0900)
commitedcacb4f862630db8f91aa9c48d6a45d095334bc
tree22d4189d3e04bf4d32116fefabf8239111522e22
parent0f35b9b32209454f1520fb8467820392446db7c1
parentaf206114a8d328e838f8299efd88ea395c30d83a
Merge remote-tracking branch 'origin/tizen' into da-setting

Change-Id: I844083d81e2c10145209ab666585a8306a571747
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>