tree e4ea512b52340ecbddf957a65c52b5b96907c6dc
parent fcc61ec20932de83d385131983b47f82a2008cd3
parent a3bd410b30ae944d5033537357a0c01a56461e4d
author Elliott Hughes <enh@google.com> 1267467586 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1267467586 -0800

Merge "Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo."