commit d441dca72bfdf5cf4eb79fdd77b2fab0e4e598ff
author Paul Duffin <paulduffin@google.com> Tue Dec 08 06:17:03 2015 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 06:17:03 2015 -0800
tree 4abac93348336b035e1f161c0771faf73a18eab2
parent 4135a54df9fc196feb76ce7364425b19647866e4
parent 0ec9daecc6129529fc6f2d66c29876eca88c492f

Merge "Follow-up to Switch to the latest version of Caliper" am: 80d5bef6f9
am: 0ec9daecc6

* commit '0ec9daecc6129529fc6f2d66c29876eca88c492f':
  Follow-up to Switch to the latest version of Caliper

core/tests/benchmarks/Android.mk

diff --git a/core/tests/benchmarks/Android.mk b/core/tests/benchmarks/Android.mk
index b7b295a..26a44a6 100644
--- a/core/tests/benchmarks/Android.mk
+++ b/core/tests/benchmarks/Android.mk
@@ -23,7 +23,6 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_SRC_FILES := $(call all-java-files-under, src/)
-LOCAL_NO_STANDARD_LIBRARIES := true
 
 LOCAL_JAVA_LIBRARIES := \
   caliper-api-target \