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

Skip to content
Commit dca0ca78 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

resolve merge conflicts of 79586ad0 to nyc-dev-plus-aosp 

am: d36f2ac0

* commit 'd36f2ac0':
  Add JarJar support to BUILD_HOST_JAVA_LIBRARY
parents 5ba14b49 d36f2ac0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment