Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54739005 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 13d71d33: am 2bf953a9: Merge "resolved conflicts for merge of a6405e9d to... 

am 13d71d33: am 2bf953a9: Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev

* commit '13d71d33':
  libcorkscrew: avoid future name collisions.
parents 75e65e06 13d71d33
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment