Skip to content
Commit 3a9f2563 authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak
Browse files

resolve merge conflicts of 2ce1b38e to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia1eb0590edf2b074f6cbf16060cda2257091edd8
parents 5bda8323 2ce1b38e
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