tree b316db7dee11d1aeee3510562e036fd41705b8b5
parent b51c91013342a3508cab1953c582cb0e27705185
parent 25a6c4cb469afbec79d1c6dda258a3efae80ddb6
author Paul Duffin <paulduffin@google.com> 1484044944 +0000
committer android-build-merger <android-build-merger@google.com> 1484044944 +0000

Upgrade to JUnit 4.12 am: aeb93fc33c
am: 25a6c4cb46

Change-Id: I697a6612203ee0212a7588b3ebeea15c0a789b7a