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

Commit 5cb89c74 authored by Yohann Roussel's avatar Yohann Roussel Committed by Android Git Automerger
Browse files

am 12b2e7c4: (-s ours) am 1d8b17ac: (-s ours) am 2db531ee: (-s ours) Merge... 

am 12b2e7c4: (-s ours) am 1d8b17ac: (-s ours) am 2db531ee: (-s ours) Merge "[DO NOT MERGE] Allow compilation with Jack."

* commit '12b2e7c4':
  [DO NOT MERGE] Allow compilation with Jack.
parents 24b8aabd 12b2e7c4
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