Commit cbefc991 authored by Vladimir Marko's avatar Vladimir Marko
Browse files

resolve merge conflicts of e546841c to master 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I2fd7e30e097df769b302cec1b54b715a4a70ba90
parents 5f8d2168 e546841c
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