Commit 394ebe47 authored by Alex Klyubin's avatar Alex Klyubin
Browse files

resolved conflicts for merge of 323fed21 to klp-dev 

Change-Id: Idde0504ba7375d8932ded1b28d8f27f46cb09834
parents cf058b2d 323fed21
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment