From 4929eb8c2cfb7dedc170beb81601c135b5b6d6dd Mon Sep 17 00:00:00 2001 From: Danesh M Date: Wed, 1 Oct 2014 11:04:37 -0700 Subject: [PATCH 1/3] Build : Update mockito reference to fork Change-Id: I4483b3c1c64daedb36f38700d9706f995dc3d359 --- default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.xml b/default.xml index 6051d0f5..565816ab 100644 --- a/default.xml +++ b/default.xml @@ -213,7 +213,7 @@ - + From 29db57e6bfc80519cb90ad7ae22ffef029805abc Mon Sep 17 00:00:00 2001 From: "Brint E. Kriebel" Date: Wed, 1 Oct 2014 12:19:58 -0700 Subject: [PATCH 2/3] build: reference default branches for mockito Change-Id: I1c2eea9d017e4c01ba9c797589a9f9c37d3cd7ba --- default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.xml b/default.xml index 565816ab..f29d3d67 100644 --- a/default.xml +++ b/default.xml @@ -213,7 +213,7 @@ - + From 0730a2de6138d998b654adca1ecdda5df58b08c3 Mon Sep 17 00:00:00 2001 From: Danesh M Date: Thu, 16 Oct 2014 17:41:09 -0700 Subject: [PATCH 3/3] Android : Switch back to aosp mockito Reason : Breaks building of cts Change-Id: I948363b15075ec58aceceff78ebe4ea72fc9487f --- default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.xml b/default.xml index f29d3d67..6051d0f5 100644 --- a/default.xml +++ b/default.xml @@ -213,7 +213,7 @@ - +