Merge remote-tracking branch 'tizen/tizen' into ckm 90/58790/1
authorBartlomiej Grzelewski <b.grzelewski@samsung.com>
Wed, 3 Feb 2016 11:05:07 +0000 (12:05 +0100)
committerBartlomiej Grzelewski <b.grzelewski@samsung.com>
Wed, 3 Feb 2016 11:05:21 +0000 (12:05 +0100)
Change-Id: Idd9657344d2e3130e2f92557545f3884732ef3af


Trivial merge