projects / platform / core / context / context-provider.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fb162c 6987b02)
Merge branch 'devel/tizen' into tizen 58/113058/1
authorMu-Woong Lee <muwoong.lee@samsung.com>
Mon, 6 Feb 2017 02:01:14 +0000 (11:01 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Mon, 6 Feb 2017 02:01:14 +0000 (11:01 +0900)
* devel/tizen:
  Add defence code for duration calculation when time manually changed
  Add a cache for application display types

Change-Id: I9fdf754c635fe822c68d1d0ded939c762e11b2fc
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

Trivial merge
Domain: Service Framework / Context;