OSDN Git Service

am 7fa4a21e: (-s ours) am 780c2372: accommodate both new and old target-files when...
authorDoug Zongker <dougz@android.com>
Wed, 22 Sep 2010 17:22:14 +0000 (10:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Sep 2010 17:22:14 +0000 (10:22 -0700)
Merge commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c'

* commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c':
  accommodate both new and old target-files when creating incrementals (do not merge)


Trivial merge