Merge 'acr2' into 'tizen' 05/83505/1
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 11 Aug 2016 09:02:08 +0000 (11:02 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 11 Aug 2016 09:04:04 +0000 (11:04 +0200)
Change-Id: I054b8cecd5ad74381df6d184b2592e3b7e52b037


Trivial merge