Skip to content
Commit 6917e8cc 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: 344d57e1 

am: ef61e778

Change-Id: I8ac132dd709205cd99123385001b290602cff9d1
parents 536b39cc ef61e778
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