Merge branch 'devel/tizen_3.0' into tizen 59/87359/1 accepted/tizen/common/20160907.154907 accepted/tizen/ivi/20160908.044443 accepted/tizen/mobile/20160908.044333 accepted/tizen/wearable/20160908.044416 submit/tizen/20160907.123648
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 7 Sep 2016 12:26:13 +0000 (21:26 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 7 Sep 2016 12:26:13 +0000 (21:26 +0900)
commit6963d2d5d749ace25dfe814c14b804b19faab3ed
treeae7612b3fa5b977b742d85308555c38fde152962
parentde90e338dbd39e4cc5c2e1445fa7459a34075e75
parentbb04e71adf07d98d0059778ae8e6481f974cd0dd
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Version 0.9.6
  Per app battery usage (Only foreground app duration considered - based on HEART cpu db)
  Custom types are modified
  Enable MyPlace detector
  [my-place] User consent starts/stops UserPlaces engine.
  [my-place] VisitDetector memory fix.
  [my-place] User consent transfer from client (location-setting) to internal db and back.
  [my-place] PlaceRecognitionProvider::isSupported() implementation.
  [my-place] UserPlaces facade refactoring to static methods.
  [my-place] DatabaseManager usage refactoring.
  sensor: add queryRaw function for pedometer

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