Merge branch 'devel/tizen_3.0' into tizen 17/59617/1 accepted/tizen/ivi/20160316.081210 accepted/tizen/mobile/20160217.080143 accepted/tizen/tv/20160217.080159 accepted/tizen/wearable/20160217.080221 submit/tizen/20160217.024754 submit/tizen_common/20160218.142243 submit/tizen_ivi/20160316.020237
authorMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 17 Feb 2016 02:39:22 +0000 (11:39 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Wed, 17 Feb 2016 02:39:22 +0000 (11:39 +0900)
commite55236b9dfc7ed25cafce54316b24fb3face09df
treee286cd9cb04e03e55f257204f01a47f70b68ce79
parent046ea44b629d870894546876d243d87d9084a9a5
parent0e220384ffdb6a069c1b8d31a64c5777bd918f86
Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  Rename & reorder sleep stage enum

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