Merge "Merge branch 'master' into resource-manipulation" into resource-manipulation
authorUze Choi <uzchoi@samsung.com>
Wed, 17 Jun 2015 05:32:37 +0000 (05:32 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 17 Jun 2015 05:32:37 +0000 (05:32 +0000)

Trivial merge