OSDN Git Service

am 5b739d81: (-s ours) am 3d3c1985: disable mr stretchy, but leave the support code...
authorMike Reed <reed@google.com>
Thu, 28 Jan 2010 18:47:03 +0000 (10:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 Jan 2010 18:47:03 +0000 (10:47 -0800)
commit33491cf80e0f9181e2e1ef1bed3dd5b9ffb8d8ce
tree62abfc56de30ba80713b596e994eb8f3fb1008e0
parent1bc9c7464052c544ff5719bca614be3228f5985c
parent5b739d8102982d24924aae0dbbb74b9fbc1c46ae
am 5b739d81: (-s ours) am 3d3c1985: disable mr stretchy, but leave the support code around for now

Merge commit '5b739d8102982d24924aae0dbbb74b9fbc1c46ae'

* commit '5b739d8102982d24924aae0dbbb74b9fbc1c46ae':
  disable mr stretchy, but leave the support code around for now