tree 750f41a5a32dc03f7006376103ae2bae04291636
parent 5a0adf95b1170d3d9ec91b0106662cd17514f0e4
author Brian Carlstrom <bdc@google.com> 1280961952 -0700
committer Brian Carlstrom <bdc@google.com> 1280961952 -0700

Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit b99a099c
git cherry-pick --no-commit 9811671e023ceb82029040f7acf599013c773e6b
git cherry-pick --no-commit d0645bf0cc76ef7be11cf77a8e1995233a1972e4

Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1