Merge remote-tracking branch 'origin/tizen' into da-setting 52/29452/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Tue, 28 Oct 2014 05:16:14 +0000 (14:16 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Tue, 28 Oct 2014 05:16:27 +0000 (14:16 +0900)
commit9b9ada2141b5735b134ef4a176b2e5ba5bc487d5
tree8c23f598cd8a17ab4bd38112d99d75e7738b66a0
parentebb1bad3b69b2e95eddbf7eefe23d8e4ec16fe74
parent5315d3f41092fc9c9e46c23943241eee256e0c0f
Merge remote-tracking branch 'origin/tizen' into da-setting

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