commit | 46c0882525fa7c17e048d847f297674e863b5b29 | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Tue Apr 21 20:10:55 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 21 20:10:58 2015 +0000 |
tree | c1a7ad1dd5021fd9f939c8d4f350cb41945065b8 | |
parent | 76154901be6b2bd0545d9d3b869762fd0e6ba116 [diff] | |
parent | 9afa723dcebf18759c63dc1c976b05050e348d2a [diff] |
Merge "CallLogAdapter cleanup and refactoring."
diff --git a/Android.mk b/Android.mk index baf71ad..11e7450 100644 --- a/Android.mk +++ b/Android.mk
@@ -19,7 +19,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \ - frameworks/support/v7/cardview/res + frameworks/support/v7/cardview/res frameworks/support/v7/recyclerview/res LOCAL_AAPT_FLAGS := \ --auto-add-overlay \