Merge branch 'master' into cloud-interface
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Tue, 19 Jul 2016 08:46:37 +0000 (17:46 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Tue, 19 Jul 2016 08:48:10 +0000 (17:48 +0900)
commit138135d2940862a284b47e0a067b9ec8dfd53e43
tree191519872a4f47a75e1b3d53508bc7b6333d7223
parent945944cb3ff5efaccd03e8efa23199e58bd59ded
parentf10e37bba046abe4b111b2c429fc0889be46f1d3
Merge branch 'master' into cloud-interface

Change-Id: I6c9ce353f30bfa10b438a5eb30bfa854af0ff267
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>