diff options
| author | Ying Wang <wangying@google.com> | 2014-11-17 19:24:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 19:24:11 +0000 |
| commit | affbaee9c155fa575b5ea1b1856715578226ff69 (patch) | |
| tree | 6a6e2707c64137b910c2ffb73617d1aedbea3999 /Android.mk | |
| parent | 8a88db1bee61adbc8bfcb679da00b8fdc539c771 (diff) | |
| parent | c2045047735522f50bc1d2618280bd37306f18d2 (diff) | |
| download | frameworks_base-affbaee9c155fa575b5ea1b1856715578226ff69.zip frameworks_base-affbaee9c155fa575b5ea1b1856715578226ff69.tar.gz frameworks_base-affbaee9c155fa575b5ea1b1856715578226ff69.tar.bz2 | |
am c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp
* commit 'c2045047735522f50bc1d2618280bd37306f18d2':
Move preloaded-classes out of framework.jar.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -409,9 +409,6 @@ LOCAL_DX_FLAGS := --core-library --multi-dex LOCAL_RMTYPEDEFS := true -# List of classes and interfaces which should be loaded by the Zygote. -LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes - include $(BUILD_JAVA_LIBRARY) framework_module := $(LOCAL_INSTALLED_MODULE) |