tree 8eb9fc51a793e5ac6506b47a34c57af97e6df305
parent 3c6af72b5f63b607b5f7b4cb87c1fc5a938412ec
parent 548ada6d5598559edd739015bb9f54fb5c2cbf20
author Elliott Hughes <enh@google.com> 1267467961 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1267467961 -0800

am 16525029: Merge "Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo."

Merge commit '165250293744f0aadcb0a0bfba1b53b8a4fb99b7' into dalvik-dev

* commit '165250293744f0aadcb0a0bfba1b53b8a4fb99b7':
  Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo.