OSDN Git Service

am 3c4760fe: am 1310319f: am 3e9bfe0b: Support dalvikvm on a Linux x86 host
authorJesse Wilson <jessewilson@google.com>
Mon, 23 Aug 2010 07:02:56 +0000 (00:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Aug 2010 07:02:56 +0000 (00:02 -0700)
Merge commit '3c4760fe40ea292c0cadd4aad6b33f6d0eafeeb3' into dalvik-dev

* commit '3c4760fe40ea292c0cadd4aad6b33f6d0eafeeb3':
  Support dalvikvm on a Linux x86 host

1  2 
vm/Dvm.mk

diff --cc vm/Dvm.mk
Simple merge