tree 2d5086b9cf43861f21935f3babe1415f2a654b10
parent e4e53cc8a7b4274715e273efbdb2766622496106
parent e0df57581a9309753c5b827731215865559c7fa2
author Paul Duffin <paulduffin@google.com> 1481801811 +0000
committer android-build-merger <android-build-merger@google.com> 1481801811 +0000

Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10" am: 50db5f5810 am: 38d1882ee2
am: e0df57581a

Change-Id: I4016437334f02a093d15f8c0dc0d3f39039d7f43