projects / platform / core / convergence / d2d-conv-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0eadb6a e6ecebe)
Merge branch 'tizen' into tizen_3.0 69/94969/1 submit/tizen_3.0/20161102.055958
authorHongkuk, Son <hongkuk.son@samsung.com>
Wed, 2 Nov 2016 05:14:01 +0000 (14:14 +0900)
committerHongkuk, Son <hongkuk.son@samsung.com>
Wed, 2 Nov 2016 05:14:36 +0000 (14:14 +0900)
* tizen:
  Addition the Access Control module for mobile and wearable.
  Modified the IP address Parser.
  Modified websocket timeout value for optimization
  Temporarily blocked remote app control service on TV

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I34c83a6377e9aeae019e49300b15e318ca271457


Trivial merge
Domain: Service Framework / Convergence;