Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation
authorYounghyun Joo <yh_.joo@samsung.com>
Sat, 19 Sep 2015 09:09:56 +0000 (18:09 +0900)
committerYounghyun Joo <yh_.joo@samsung.com>
Sat, 19 Sep 2015 09:09:56 +0000 (18:09 +0900)
Change-Id: I56e84e31987766e5fc97cf3dafa7882f55ae1ef4
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>

Trivial merge