Skip to content
Commit da459776 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Remove conflicting package information for junit.runner and junit.textui" am: f3f4775a 

am: 9b5522f8

Change-Id: I4925285c1ea3027d46ac396b8ea29ac44c075e0d
parents e13bfbde 9b5522f8
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