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)
commit76f51fe8850bda455bccd5507b8b71548da8238b
treefd5ae93fe5adeb807173340e82f05ed14d0ffd95
parent50e927d45f2161d89ee25a5fab2c11055f233ed4
parent4917d860c798e392cd4c38c867768038cc3acb08
Merge "Merge branch 'master' into resource-manipulation" into resource-manipulation