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)
* commit '47f387fdb2c9e81ee710f41b1e79f1419817801a':
  Revert crash on bad scale - do not merge


Trivial merge