Merge branch 'tizen' into ckm 99/47899/1
authorBartlomiej Grzelewski <b.grzelewski@samsung.com>
Wed, 9 Sep 2015 16:30:42 +0000 (18:30 +0200)
committerBartlomiej Grzelewski <b.grzelewski@samsung.com>
Wed, 9 Sep 2015 16:30:46 +0000 (18:30 +0200)
Change-Id: I0f1e194e469e6dd00ef0627ed9d9357eef422afb


Trivial merge