tree 0c59dad7485a097075b9ed5b4984de9dcbb5395b
parent 3e9bfe0bed2f27d01efdb03a71025c421d321956
parent b8c347d05fc8137d793df4dfdb98c429151d54a4
author Brian Carlstrom <bdc@google.com> 1282242072 -0700
committer Brian Carlstrom <bdc@google.com> 1282336069 -0700

Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-gingerbread

Also includes cherry-pick of 07ecdc0b5d92099364eebdaee9aec297c4bbad72

Change-Id: Ie1744d78683f2f66dd1586f453f8bdd56ad2e9a5