tree 7b75c46004b807f9a00d6bd39a35f03add671a49
parent 301b1df2f0b25ef56a640840742c981623faf20f
parent 166ed46d7e5312857b8a9b8d07c00373c596c1b3
author Brian Carlstrom <bdc@google.com> 1282163949 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282163949 -0700

am 166ed46d: Cherry picking changes from dalvik-dev

Merge commit '166ed46d7e5312857b8a9b8d07c00373c596c1b3' into gingerbread-plus-aosp

* commit '166ed46d7e5312857b8a9b8d07c00373c596c1b3':
  Cherry picking changes from dalvik-dev