From: Doug Zongker Date: Wed, 22 Sep 2010 17:22:14 +0000 (-0700) Subject: am 7fa4a21e: (-s ours) am 780c2372: accommodate both new and old target-files when... X-Git-Tag: android-x86-4.4-r1~2136 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b8d49163fef5492326f86fd02e4562bc1fa391a8;p=android-x86%2Fbuild.git 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) --- b8d49163fef5492326f86fd02e4562bc1fa391a8