Merge "Merge branch 'master' into resource-manipulation" into resource-manipulation
authorUze Choi <uzchoi@samsung.com>
Mon, 6 Jul 2015 02:42:54 +0000 (02:42 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 6 Jul 2015 02:42:54 +0000 (02:42 +0000)

Trivial merge