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

Merge "Remove conflicting package information for junit.runner and... 

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

Change-Id: Ibbcb838b9d41391b559a555111ebafce437a5679
parents a1d54802 da459776
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