Merge branch 'upstream' into tizen 25/96425/1
authorYu Jiung <jiung.yu@samsung.com>
Wed, 9 Nov 2016 02:16:20 +0000 (11:16 +0900)
committerYu Jiung <jiung.yu@samsung.com>
Wed, 9 Nov 2016 02:19:52 +0000 (11:19 +0900)
commit4486382682f22650e6de23a607d92dbccc3c9aee
tree157dd2a20420170e955b14c3263b01c73a96db1f
parentd4ec89bbd4058481e3089c5a410a7835c1168bd9
parentb6627e2c19506bd30328969ea8aab73fa0945f36
Merge branch 'upstream' into tizen

Change-Id: If6a93118ede3c8d2c51e6c76df37b2fdf0df49ed