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

Skip to content
Commit 2ea6527e authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 5a98ec04: resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp 

Merge commit '5a98ec04'

* commit '5a98ec04':
  Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
parents 02800879 5a98ec04
Hide 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