Commit f6f6d697 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

resolve merge conflicts of 6c1149d7 to klp-modular-dev-plus-aosp. 

Change-Id: Ia05aa968e5f350c2768fc81491050001fcc94a5d
parents 19df51c0 6c1149d7
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