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

Skip to content
Commit 9b6865f8 authored by Evan Charlton's avatar Evan Charlton Committed by Android Git Automerger
Browse files

am 606540b7: resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp 

Merge commit '606540b7'

* commit '606540b7':
  Packages can specify where to find AndroidManifest.xml
parents 1812dfda 606540b7
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