Merge commit '606540b7' * commit '606540b7': Packages can specify where to find AndroidManifest.xml
Attach a file by drag & drop or click to upload
