Merge commit 'af35045308e6b0221690b420f530e53ce6c2fbad' into HEAD 05/29205/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Wed, 22 Oct 2014 11:10:37 +0000 (13:10 +0200)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Wed, 22 Oct 2014 11:11:01 +0000 (13:11 +0200)
Change-Id: Ib16081848a41ef480360b31a14bb9a9bc4786c3f


Trivial merge