commit 9f2dab87c54f904a2bfc6d8cbcfc0d248c4e24a9
author Brian Carlstrom <bdc@google.com> Fri Apr 01 15:47:17 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri Apr 01 15:47:17 2011 -0700
tree 390195326a93a3b886181d1adc10cb2aa2808879
parent a073ebfc85198ee721cd94c8e6dbd2418e617e8a

Tracking merge of dalvik-dev to master

git cherry-pick --no-commit  4ba5d9c906047ae96045390e8e2e67b8bf64c7fb

git cherry-pick --no-commit  d6cf903af4c5b3f6bb107d4c1a6c34713ee1ff46

git cherry-pick --no-commit  47cbcfe2e49420bcd59499cdd4cfb32fbf062e68

git cherry-pick --no-commit  a83d47ae665bccf94dc7720b0b05bf4215af6863

git cherry-pick --no-commit  c51299d2e2f43c13fa7514c1fb9c0089ed9a9ad8

git cherry-pick --no-commit  523fa6ab3943e18979bc9df99787a77b15177f5d

git cherry-pick --no-commit  bf0712aba9e7b1114ff224fa30da159067868ef1

Change-Id: I7c0d213126b6dd8981b912b588803fd7ac382396