Merge branch 'tizen_3.0' into tizen 99/103599/1
authorYunmi Ha <yunmi.ha@samsung.com>
Fri, 9 Dec 2016 02:06:58 +0000 (11:06 +0900)
committerYunmi Ha <yunmi.ha@samsung.com>
Fri, 9 Dec 2016 02:11:32 +0000 (11:11 +0900)
Change-Id: I29db5357fcaed8dd78c8a10d923c030b14615c0b


Trivial merge