OSDN Git Service

am 4d59d18a: Merge change Ib18a32c1 into eclair
authorXavier Ducrohet <xav@android.com>
Fri, 9 Oct 2009 21:29:27 +0000 (14:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Oct 2009 21:29:27 +0000 (14:29 -0700)
commit84ad45ed11e1e81384ff845a642b3d2d3c701b5d
treed5d2dbe436fbd110d488ec51f0568f6f8dec23cb
parent23298cead111a5e957b0c6dd4266ffc06ce6754b
parent0820b9f3932c5fda5943f603407e731c9a8768f6
am 4d59d18a: Merge change Ib18a32c1 into eclair

Merge commit '4d59d18abaf5546ab1c2cccd11655073df937c18' into eclair-mr2

* commit '4d59d18abaf5546ab1c2cccd11655073df937c18':
  Minor label change (size -> resolution)