Merge commit '0a4a393d717a2289c9fa2036f502f97c74d56e35'

* commit '0a4a393d717a2289c9fa2036f502f97c74d56e35':
  Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
This commit is contained in:
Brian Carlstrom 2010-08-18 13:41:09 -07:00 committed by Android Git Automerger
commit 76fedd24f3

View File

@ -14,6 +14,11 @@
# limitations under the License.
#
LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_SIMULATOR),true)
include $(call all-subdir-makefiles)
else
# The host dalvikvm needs Android's concatenated & indexed timezone data.
include $(LOCAL_PATH)/libc/zoneinfo/Android.mk
endif