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

Commit 40d2e112 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

[automerger skipped] Merge "Allow other module types in androidx" am:... 

[automerger skipped] Merge "Allow other module types in androidx" am: 6edff695 am: 6f716787 am: 98d8ec42
am: f9d1acf2 -s ours
am skip reason: change_id I9a8fbcff903cc395d5dc38430774202ce389d6bc with SHA1 bd7c2f9a is in history

Change-Id: Ic64b4e0e163e2edb90ab90ec6830afa31f18ad0a
parents a907ef8b f9d1acf2
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