OSDN Git Service

am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files
authorDoug Zongker <dougz@android.com>
Wed, 2 Sep 2009 18:15:52 +0000 (11:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2009 18:15:52 +0000 (11:15 -0700)
Merge commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54' into eclair-plus-aosp

* commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54':
  do a pass of normal-chunk-merging before comparing src and tgt files


Trivial merge