OSDN Git Service

am fae32a91: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 21:29:43 +0000 (14:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Jul 2010 21:29:43 +0000 (14:29 -0700)
commitc2b3cc3a23360f40eb6efc6ff9b12f7d84128f0a
treec959aa9858c2170f63b0d51c6df878262afe679a
parent56997a98c3da80c520d43978d9082233eb164064
parentfae32a91bcc0c0f397ea681a245d32e759718618
am fae32a91: merge from open-source master

Merge commit 'fae32a91bcc0c0f397ea681a245d32e759718618'

* commit 'fae32a91bcc0c0f397ea681a245d32e759718618':
  Revert "acp: Ensure dst mtime always greater or equal to src mtime"
  acp: Ensure dst mtime always greater or equal to src mtime