projects
/
platform
/
upstream
/
iotivity.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ed0b970
2dbcd7c
)
Merge branch 'master' into resource-manipulation
author
hunje.yeon
<hunje.yeon@samsung.com>
Thu, 4 Jun 2015 00:43:12 +0000
(09:43 +0900)
committer
hunje.yeon
<hunje.yeon@samsung.com>
Thu, 4 Jun 2015 00:45:43 +0000
(09:45 +0900)
Update latest changes from master branch into resource-manipulation
Change-Id: I70c34dc88a66acf933deb9f8a8ca30c329470251
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Trivial merge