tree 8776b8b4c2c117e07a02031184951dc572003602
parent f99687ee83259fc875dfe06015b70583350382e0
parent c62c3a51d502c58f25db3f13810aba5959876fd6
author Paul Duffin <paulduffin@google.com> 1479996184 +0000
committer android-build-merger <android-build-merger@google.com> 1479996184 +0000

Merge "Move JUnit classes from here into external/junit" am: 552744390f
am: c62c3a51d5

Change-Id: I9c260108edea555dc75811b7d343ec33655397d9