Merge remote-tracking branch 'origin/master' into extended-easysetup
authoruzchoi <uzchoi@samsung.com>
Mon, 18 Jul 2016 02:36:12 +0000 (11:36 +0900)
committeruzchoi <uzchoi@samsung.com>
Mon, 18 Jul 2016 02:39:09 +0000 (11:39 +0900)
commita5c63ff4150291f73fe6fc826d00bdc0141d2fe0
treee9cf8130d9807dea7d4e3dac6ad10a8c7874ab56
parentdb420230e956243b9a14ee471a3432d0e4d16b67
parentf10e37bba046abe4b111b2c429fc0889be46f1d3
Merge remote-tracking branch 'origin/master' into extended-easysetup

Conflicts:
service/easy-setup/mediator/richsdk/src/RemoteEnrolleeResource.cpp

Change-Id: I2868246122ea799fd75111f439ed1f410f950592