Skip to content
Commit 6d48d60f authored by Selim Cinek's avatar Selim Cinek
Browse files

resolve merge conflicts of ce40da80 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie778d57e3135d6497f6ff372d5e81d5b714707ff
parents 842a51d8 ce40da80
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment