Merge branch 'tizen_dev' into tizen 18/136918/1 submit/tizen/20170703.150902 submit/tizen/20170717.072234 submit/tizen_4.0/20170811.094300
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Mon, 3 Jul 2017 12:22:33 +0000 (15:22 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Mon, 3 Jul 2017 12:22:33 +0000 (15:22 +0300)
commitc272af9fde05c98ab1f285ca67ed35d4f2ce3aac
tree277185fb1a9731041c5c7d9bda0daebe9e0041fb
parente6767eae75241f91036ae10f13abb8a16050f9ce
parent18b870ad977ea1a214c3a4f510386a611b685dba
Merge branch 'tizen_dev' into tizen

Conflicts:
tizen-manifest.xml

Change-Id: I0febbc401e2ee1b763a94c60f40f351f611dd439
tizen-manifest.xml