Version 6.30
authorMu-Woong <muwoong.lee@samsung.com>
Thu, 11 Jun 2015 01:51:06 +0000 (10:51 +0900)
committerMu-Woong <muwoong.lee@samsung.com>
Thu, 11 Jun 2015 01:51:06 +0000 (10:51 +0900)
Change-Id: I50787dc09094b0f59b1a174699eca2652915a1e0
Signed-off-by: Mu-Woong <muwoong.lee@samsung.com>

Trivial merge