Merge branch 'tizen' into tizen_3.0 "Block display on PowerOff" 25/102625/1 accepted/tizen/3.0/common/20161207.194551 accepted/tizen/3.0/mobile/20161207.012115 accepted/tizen/3.0/wearable/20161207.012117 submit/tizen_3.0/20161206.080717
authorjunkyu han <junkyu.han@samsung.com>
Tue, 6 Dec 2016 08:05:01 +0000 (17:05 +0900)
committerjunkyu han <junkyu.han@samsung.com>
Tue, 6 Dec 2016 08:05:45 +0000 (17:05 +0900)
Change-Id: I6c8b765f3f0ee0b54ce52c7a5b41013064bdfd17


Trivial merge