Merge branch 'devel/tizen_3.0' into tizen 37/62237/1
authorMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 15 Mar 2016 03:20:28 +0000 (12:20 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 15 Mar 2016 03:20:28 +0000 (12:20 +0900)
commit06d20191dda34e805cff213bc190f660853e8a42
tree774426076b5702d5ee5945fe408df0ba800f5038
parent97a497f83b32ebe415f69ddfa16a35a377f48f69
parent384b5eeda1af9ffe6294c880f3f095a0d05a5027
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Version 0.7.4
  Contacts db changed provider added
  Version 0.7.3

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

Change-Id: Ie6b0c18ad51f580d83f43dfd3690074cf8f0f18b