Merge branch 'devel/tizen_3.0' into tizen 32/68332/1 accepted/tizen/common/20160504.153330 accepted/tizen/ivi/20160504.114841 accepted/tizen/mobile/20160504.114438 accepted/tizen/wearable/20160504.114608 submit/tizen/20160504.014504
authorMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 3 May 2016 11:45:55 +0000 (20:45 +0900)
committerMu-Woong Lee <muwoong.lee@samsung.com>
Tue, 3 May 2016 11:45:55 +0000 (20:45 +0900)
* devel/tizen_3.0:
  Check null when TemplateManager is destroyed

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

Trivial merge