Merge branch 'tizen_dev' into tizen 41/93341/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Sun, 23 Oct 2016 08:05:58 +0000 (11:05 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Sun, 23 Oct 2016 08:06:05 +0000 (11:06 +0300)
Change-Id: If28a9e6197282de7a3c0ac6e411069fa09a7adec
Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>

Trivial merge