tree 9323c98b41a3b05eebbded8f1a8bd616d0eadd1c
parent a3779fa378345bfd8699e91de46b29563be4beb2
parent 27301cec822fe89715eb4260cd046b14b8edee2c
author Brian Muramatsu <btmura@android.com> 1297796399 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297796399 -0800

am 27301cec: am 60d86596: Merge "Bypass testFormatMethods if device is not using en_US resource." into gingerbread

* commit '27301cec822fe89715eb4260cd046b14b8edee2c':
  Bypass testFormatMethods if device is not using en_US resource.