tree d810cf6622348d6b00a1dd37e639c56e7b13c3ec
parent cb47118af13be8efb2d4344d045744f5320ec07d
parent f3f4775a35d0ba972381e2bcc3c4af8d1fb1f857
author Paul Duffin <paulduffin@google.com> 1487777067 +0000
committer android-build-merger <android-build-merger@google.com> 1487777067 +0000

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

Change-Id: Ie0ca0b2b6b5f06e90f55996625f758521c9039cb