projects
/
platform
/
core
/
api
/
webapi-plugins.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
153828a
2557c62
)
Merge branch 'tizen_4.0' into tizen
49/179549/1
accepted/tizen/unified/20180522.055729
submit/tizen/20180518.121229
author
Piotr Kosko
<p.kosko@samsung.com>
Fri, 18 May 2018 12:08:28 +0000
(14:08 +0200)
committer
Piotr Kosko
<p.kosko@samsung.com>
Fri, 18 May 2018 12:08:28 +0000
(14:08 +0200)
Conflicts:
src/humanactivitymonitor/humanactivitymonitor_manager.cc
Change-Id: I7f7835ce9ce66f38d7b481a1e479cf0d24a67069
1
2
src/humanactivitymonitor/humanactivitymonitor_manager.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/humanactivitymonitor/humanactivitymonitor_manager.cc
Simple merge
projects / platform / core / api / webapi-plugins.git / commitdiff