OSDN Git Service

am c399a2ca: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Jul 2010 18:56:19 +0000 (11:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Jul 2010 18:56:19 +0000 (11:56 -0700)
Merge commit 'c399a2caea7660b7e6ed6f816440edd73ba7ff37'

* commit 'c399a2caea7660b7e6ed6f816440edd73ba7ff37':
  Don't prelink dalvik for x86

1  2 
vm/Android.mk

diff --cc vm/Android.mk
Simple merge