OSDN Git Service

am a0c1ab8d: (-s ours) when finding left edge of text block, don\'t merge in tall...
authorCary Clark <cary@android.com>
Wed, 26 Aug 2009 19:51:14 +0000 (12:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Aug 2009 19:51:14 +0000 (12:51 -0700)
Merge commit 'a0c1ab8dc2c9207522a7131843de9c6a7130ac7b'

* commit 'a0c1ab8dc2c9207522a7131843de9c6a7130ac7b':
  when finding left edge of text block, don't merge in tall bitmap


Trivial merge