Merge remote-tracking branch 'tizen/tizen' into ckm 25/59425/1
authorBartlomiej Grzelewski <b.grzelewski@samsung.com>
Mon, 15 Feb 2016 10:59:52 +0000 (11:59 +0100)
committerBartlomiej Grzelewski <b.grzelewski@samsung.com>
Mon, 15 Feb 2016 11:00:02 +0000 (12:00 +0100)
Change-Id: Ieb9b5bd0f3c25ef9d37472cab42187d1b60b4f6d


Trivial merge