commit 3806f977e65e9a1e6ee41dba404bd022a4791c16
author Maurice Lam <yukl@google.com> Fri Feb 12 15:51:43 2016 -0800
committer Maurice Lam <yukl@google.com> Tue Feb 16 17:22:08 2016 -0800
tree fed9c05f67b601e1def678905a575780d5f2eac9
parent efc87af3f817921c187ef0be7c0860e71f7ce7ea

Revert "Revert "Use SetupWizardPreferenceLayout""

This reverts commit 73512ee6842166bbf0b37d70983595911b87db2d.

With ag/866290, this change can be applied again.

Bug: 27152471
Change-Id: I0fd78218b989e99873765f7678f0113fb2c08f16

Android.mk

diff --git a/Android.mk b/Android.mk
index 683db50..61734fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,7 @@
     LOCAL_JACK_FLAGS := --multi-dex native
 endif
 
-include frameworks/opt/setupwizard/library/common.mk
+include frameworks/opt/setupwizard/library/common-full-support.mk
 include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)