| commit | b8d49163fef5492326f86fd02e4562bc1fa391a8 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Wed Sep 22 10:22:14 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 22 10:22:14 2010 -0700 |
| tree | d9d7eb1bfc426df3dcfd5995c79db830854bfa9c | |
| parent | f2ab290550d6f1b1ea9bab91eb4c3c77ceeb5df4 [diff] | |
| parent | 7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c [diff] |
am 7fa4a21e: (-s ours) am 780c2372: accommodate both new and old target-files when creating incrementals (do not merge) Merge commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c' * commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c': accommodate both new and old target-files when creating incrementals (do not merge)