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)
Change-Id: If6a93118ede3c8d2c51e6c76df37b2fdf0df49ed


Trivial merge