Merge branch 'master' into cloud-interface
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Fri, 2 Sep 2016 01:19:37 +0000 (10:19 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Fri, 2 Sep 2016 01:19:37 +0000 (10:19 +0900)
commited695e9009675c7ea0317096db90b5de097cd94b
tree5520f95313fc74fb1000c38a503a6ef24e775bb6
parentb2ddbd81dfbc4b8f672b7bf9bf3edd39541e2076
parenteaa6035dda159ef9b848e5df7c81f98027b59750
Merge branch 'master' into cloud-interface

Change-Id: Ie570314a702dfbdebf798273b533256417403209
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/Constants.java