Merge branch 'tizen' into tizen_dev 39/75739/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Tue, 21 Jun 2016 07:58:57 +0000 (10:58 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Tue, 21 Jun 2016 07:59:03 +0000 (10:59 +0300)
Change-Id: Ib925964e2d19775bc643dce4cf970180aafd1efa
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge