OSDN Git Service

am 16525029: Merge "Fix a FormatFlagsConversionMismatchException bug I introduced...
authorElliott Hughes <enh@google.com>
Mon, 1 Mar 2010 18:26:01 +0000 (10:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Mar 2010 18:26:01 +0000 (10:26 -0800)
commitc202a3b1929fb518e470a43d3414f545622bb334
tree6614aa6dc483b2c6dee0b01495357e30b59a92dc
parentda4f7ed5392f700c62b06d308eb88b66de4a2ec7
parent165250293744f0aadcb0a0bfba1b53b8a4fb99b7
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.