OSDN Git Service

am 1fa15570: Merge change I112445f3 into eclair-mr2
authorMike Reed <reed@google.com>
Mon, 19 Oct 2009 18:33:25 +0000 (11:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2009 18:33:25 +0000 (11:33 -0700)
Merge commit '1fa155707e525d53454f13bd7e91d2fee26de221'

* commit '1fa155707e525d53454f13bd7e91d2fee26de221':
  return default 1.0 for scaleFactor(), since android doesn't record at the same res as it draws


Trivial merge