tree 1d389879f67c0814cd42f973aab00e6b56a155f5
parent d679e7fbd5df8f178aa0751e107580fc51208373
parent 793f142323c49818ad022a05cbfb931eefddae5b
author Lorenzo Colitti <lorenzo@google.com> 1251929800 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1251929800 -0700

am 793f1423: Merge change 23675 into eclair

Merge commit '793f142323c49818ad022a05cbfb931eefddae5b' into eclair-plus-aosp

* commit '793f142323c49818ad022a05cbfb931eefddae5b':
  Unbreak Dalvik VM initialization due to a native method that expects to be able