Commit a3499435 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

resolve merge conflicts of 36750314 to oc-mr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I1e5948e994791f4727ab5fa49c0b885551c208dc
parents 4cd0b6bd 36750314
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