OSDN Git Service

resolved conflicts for merge of fc0dcfa2 to dalvik-dev
authorAndy McFadden <fadden@android.com>
Fri, 21 May 2010 19:22:30 +0000 (12:22 -0700)
committerAndy McFadden <fadden@android.com>
Fri, 21 May 2010 19:22:30 +0000 (12:22 -0700)
commite8c725b8cd415f2896616a09ad7a4787f02ad961
treea296613e281e687f61de27e34e1851c205f9e7d8
parent2b2468eef943f0be75d73862e433d0eb9beeff93
parentfc0dcfa2ea4325b1e2a5fc938b57f1b2a50d5f67
resolved conflicts for merge of fc0dcfa2 to dalvik-dev

Change-Id: I54a5b9996252a22e8dd0214f4a4ccc8914f876ea
vm/Android.mk
vm/Dvm.mk
vm/Init.c