tree 8e1472c91e51ad75416c837dae34d299c4c6d14e
parent 6b87b3df2c5493cda939a1678ceabb49801120be
parent b6961ffa5396ad9965968095a37ddd21ed1e32b9
author Paul Duffin <paulduffin@google.com> 1481117054 +0000
committer android-build-merger <android-build-merger@google.com> 1481117054 +0000

Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b am: 9cb5f2815d
am: b6961ffa53

Change-Id: Id397baf01c8285b0843a66afd544ddf89abf451f