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

Skip to content
Commit 0bb2084e authored by Kenny Root's avatar Kenny Root Committed by android-build-merger
Browse files

resolve merge conflicts of 205bf7a1 to nyc-dev-plus-aosp. 

am: ff82588a

* commit 'ff82588a':
  Java 8 in layoutlib-create
parents 60bcf959 ff82588a
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