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)
commited03b2f2d711027561c18956826580e1e81b84ec
treea343ea0798eb3af5ca39831fd54848f9bf0cb996
parentcd42cac968ef60267b6b940ada48e3523b64a9d2
parent55d1fe2483c28e509293b9e4908d2bdfe66fb5bc
Merge "Merge branch 'master' into resource-manipulation" into resource-manipulation