Merge branch 'master' into easysetup
authorJihun Ha <jihun.ha@samsung.com>
Wed, 18 May 2016 01:19:55 +0000 (10:19 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Wed, 18 May 2016 01:19:55 +0000 (10:19 +0900)
commit4a8b7cff849e5bdb759f51a0f0c14eb99f6d1866
treebc4d24a856ee00802ce78f446b52470aaec5da19
parent50d87e9c31e837702a66346b0ece6366bab98012
parentd6b3ce170e6511c5b126a5f49197ccc8f862a0fd
Merge branch 'master' into easysetup

Change-Id: Iaa7111b7c0bdd2941d708247983bc8fc9bca8a5b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java