Merge branch 'devel/tizen_3.0' into tizen 63/65263/1 accepted/tizen/common/20160408.185625 accepted/tizen/ivi/20160411.004933 accepted/tizen/mobile/20160411.004856 accepted/tizen/wearable/20160411.004907 submit/tizen/20160408.073002
authorMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 8 Apr 2016 06:54:15 +0000 (15:54 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Fri, 8 Apr 2016 06:54:15 +0000 (15:54 +0900)
* devel/tizen_3.0:
  Version 0.7.5
  Apply journal_mode = WAL to the DB
  Modified ContextManagerImpl according to provider initialization change
  Modify some build optimization options
  Apply Tizen C++ coding style to Request
  Apply Tizen C++ coding style to context_mamanger_impl, provider(ProviderHandler)
  Apply Tizen C++ coding style to Access Control
  Apply Tizen C++ coding style to Context Trigger
  Modified to add/remove a template synchronously after initialization
  Version 0.7.3

Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
Conflicts:
packaging/context-service.spec

Change-Id: I433f47dab208ab4ae9379a9f0d3fe7f10f800fd5


Trivial merge