Merge "Changes by ACR" into tizen_2.3
authorKyuho Jo <kyuho.jo@samsung.com>
Mon, 11 May 2015 05:39:45 +0000 (14:39 +0900)
committerGerrit Code Review <gerrit@tizensrc>
Mon, 11 May 2015 05:39:45 +0000 (14:39 +0900)

Trivial merge