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

Commit 7e1ddb6a authored by Bernhard Rosenkränzer's avatar Bernhard Rosenkränzer Committed by android-build-merger
Browse files

resolve merge conflicts of 9c41490c to nyc-dev-plus-aosp 

am: ce2ea383

* commit 'ce2ea383':
  Allow building with Python 3.x
parents 5edc7a95 ce2ea383
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