Commit 43708477 authored Apr 22, 2015 by Brian Carlstrom Committed by Android Git Automerger Apr 22, 2015

am 8c934ac6: Remove workaround now unneeded with Proguard 5.1

* commit '8c934ac6':
  Remove workaround now unneeded with Proguard 5.1

Android.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -14,9 +14,6 @@ LOCAL_PRIVILEGED_MODULE := true

		LOCAL_PROGUARD_FLAGS := $(proguard.flags)

		# Workaround for "local variable type mismatch" error.
		LOCAL_DX_FLAGS += --no-locals

		include $(BUILD_PACKAGE)

		# Build the test package.