OSDN Git Service

am 0646e78e: am d7d7ab00: do a pass of normal-chunk-merging before comparing src...
authorDoug Zongker <dougz@android.com>
Wed, 2 Sep 2009 20:34:19 +0000 (13:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2009 20:34:19 +0000 (13:34 -0700)
commitdc8d202008de650ca544dd1a4ef7bcdf4f29a71e
treeea4c1d8aa9c8ad57ea1e3c5d704f8a4df087a24d
parent99677d23a21d1fbd7f50e4d3208c7046fb202464
parent0646e78e9969762ead938f953c7283d984333d99
am 0646e78e: am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files

Merge commit '0646e78e9969762ead938f953c7283d984333d99'

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