Skip to content
Commit acd3282d authored by Alexander Smundak's avatar Alexander Smundak Committed by android-build-merger
Browse files

Merge "Add dont_merge_manifests attribute to android_test" am: 657615e0 am:... 

Merge "Add dont_merge_manifests attribute to android_test" am: 657615e0 am: 344d57e1 am: ef61e778
am: 6917e8cc

Change-Id: Ia7100704b57eaf9041876b4e423c3c7607be017e
parents 1b6402d8 6917e8cc
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