Skip to content
Commit 53bf2881 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

[automerger skipped] Merge changes from topic "aapt2-warn-manifest-validation"... 

[automerger skipped] Merge changes from topic "aapt2-warn-manifest-validation" am: 61f92e7e am: 8fd23404  -s ours
am: 986e5160  -s ours

Change-Id: I7de85849261be00a32f8c1d0165a27815cc356ea
parents fb8ff257 986e5160
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