Merge branch 'master' into cloud-interface
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 19 Sep 2016 04:19:41 +0000 (13:19 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 19 Sep 2016 06:11:21 +0000 (15:11 +0900)
commitab64942a3569a387be82d12fa111184cb7d0034a
tree3f86b499b53ec75bd99500f089baacdd7344794a
parenta81526126efe742d46ce836bdeead2215f9e800a
parentfef945f09258318fc799210618c7115648df51b3
Merge branch 'master' into cloud-interface

Change-Id: I9af09877a796742be84589e70c7e3dec522422f4
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java