OSDN Git Service

am 47f387fd: (-s ours) Merge "Revert crash on bad scale - do not merge" into ics-mr0
authorChris Craik <ccraik@google.com>
Wed, 12 Oct 2011 00:32:51 +0000 (17:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Oct 2011 00:32:51 +0000 (17:32 -0700)
commit8d4d458b636af97c7050cfde478fcb39d565956e
treebea83b8d691d09469137ff0541f2cb1d60054e23
parentb8cbca7a9857b0e8003c8fab9929aa87c2c0a051
parent47f387fdb2c9e81ee710f41b1e79f1419817801a
am 47f387fd: (-s ours) Merge "Revert crash on bad scale - do not merge" into ics-mr0

* commit '47f387fdb2c9e81ee710f41b1e79f1419817801a':
  Revert crash on bad scale - do not merge