diff options
| author | Kenny Root <kroot@google.com> | 2013-08-30 16:33:34 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-08-30 16:33:34 -0700 |
| commit | e13b7b4c79c2a5db5554298035304a3c637dd590 (patch) | |
| tree | aa2addd2ae25a657067c8f18a46146536549bfd7 /JavaLibrary.mk | |
| parent | 3e3962c7bc21f3b16270e43dd05c46e298da208c (diff) | |
| parent | e89c4900bd70432d34a540838c72c4bd1a54654c (diff) | |
| download | libcore-e13b7b4c79c2a5db5554298035304a3c637dd590.zip libcore-e13b7b4c79c2a5db5554298035304a3c637dd590.tar.gz libcore-e13b7b4c79c2a5db5554298035304a3c637dd590.tar.bz2 | |
resolved conflicts for merge of e89c4900 to klp-dev-plus-aosp
Change-Id: I78bbec3aed3abb5ee4d77aea7444d44484ce729f
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index c66f677..2bed9bd 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -51,7 +51,6 @@ endef # The Java files and their associated resources. common_core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni xml) - core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) |