commit 06ce062a2ceb7ca73560edd6b2f85d0f16a17667
author Nancy Chen <nancychen@google.com> Thu Oct 23 01:17:35 2014 +0000
committer Nancy Chen <nancychen@google.com> Thu Oct 23 01:17:35 2014 +0000
tree 134c663a3d09d69f7f35ae5e837cc7acfc7b37fc
parent 5f8eaaee9c50567a4b2714bd28b4ed39b7aac2b7

Revert "Revert "Add color to PhoneAccount objects (2/3)""

This reverts commit 5f8eaaee9c50567a4b2714bd28b4ed39b7aac2b7.
We're ready to add color to PhoneAccounts

Change-Id: Ie65a13e565c26ea5e93f0835bb2c4684140455c9

Android.mk

diff --git a/Android.mk b/Android.mk
index b272445..395aacc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,7 @@
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 
-LOCAL_PROGUARD_ENABLED := optimization
+LOCAL_PROGUARD_FLAGS := $(proguard.flags)
 
 # Workaround for "local variable type mismatch" error.
 LOCAL_DX_FLAGS += --no-locals