tree 5f85a15eaa0302f9b61ee57b57279ec136353065
parent 38938d12e4e9dcfdeaa999ca53d9aacdea9489f6
parent 3177afa8177d8b31dd6bd160816a11fedeec7e07
author Dan Bornstein <danfuzz@android.com> 1283981883 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283981883 -0700

am 3177afa8: am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread

Merge commit '3177afa8177d8b31dd6bd160816a11fedeec7e07'

* commit '3177afa8177d8b31dd6bd160816a11fedeec7e07':
  Enable WITH_HOST_DALVIK for "user" builds on Linux.