Commit 9175ac3b authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

resolve merge conflicts of 7827bcc3 to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib00772a1460f0d066366edec8df35831f1039ac3
parents f628d8f2 7827bcc3
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