From 80c47b2f7961a5a8de1c6ec5751c04d15d42122a Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 19 Jun 2014 17:47:11 -0700
Subject: Use Settings app's theme for L and later

This CL must be checked in together with I506b9ae6ea.

Bug: 11866784
Change-Id: I00aa90618642758c783f7c92f162dc2ee16659a6
---
 java/Android.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'java/Android.mk')

diff --git a/java/Android.mk b/java/Android.mk
index b580624d7..0a7b21f01 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -33,6 +33,10 @@ LOCAL_AAPT_FLAGS := -0 .dict
 # Include all the resources regardless of system supported locales
 LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
 
+# TODO: Remove res-lxx reference once L-release becomes public.
+res_dirs := res res-lxx
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
+
 LOCAL_SDK_VERSION := current
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-- 
cgit v1.2.3-83-g751a