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

Skip to content
Commit 3ead0a7b authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 9bf62742: resolved conflicts for merge of a15ae216 to stage-aosp-master 

* commit '9bf62742':
  Move Java stuff out of base_rules.mk
parents 022b2bbb 9bf62742
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