tree b316db7dee11d1aeee3510562e036fd41705b8b5
parent 22e42af8019551e24386e36fe1fee75e1faacfa3
parent 418644b561db8f3bedd3937f750f9c93895fa3b9
author Paul Duffin <paulduffin@google.com> 1484045574 +0000
committer android-build-merger <android-build-merger@google.com> 1484045574 +0000

Upgrade to JUnit 4.12 am: aeb93fc33c am: 25a6c4cb46 am: 43201a730c
am: 418644b561

Change-Id: I64c502138519e5d11a434057835864a19aa51c57