commit 76fedd24f372f588a9601e826ea744c1d8ea3493
author Brian Carlstrom <bdc@google.com> Wed Aug 18 13:41:09 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 18 13:41:09 2010 -0700
tree 56a455723c5403d431a580f17702ceb2a0715f44
parent e46b482282144844273a48f40313e5f80655b9e2
parent 0a4a393d717a2289c9fa2036f502f97c74d56e35

am 0a4a393d: am 22f1e3d4: Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.

Merge commit '0a4a393d717a2289c9fa2036f502f97c74d56e35'

* commit '0a4a393d717a2289c9fa2036f502f97c74d56e35':
  Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.

Android.mk

diff --git a/Android.mk b/Android.mk
index fcc8b96..43d5499 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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