Skip to content
Commit 989b9ab5 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

[automerger skipped] AAPT2: Differentiate between Android and Java package... 

[automerger skipped] AAPT2: Differentiate between Android and Java package names am: ef506c73 am: 5cc5fdd0  -s ours
am: 937001be  -s ours

Change-Id: I52e938af2ded636732a50327662083c02274660d
parents 9f24e3fb 937001be
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