From: Xavier Ducrohet <xav@android.com>
Date: Mon, 2 Nov 2009 20:45:31 +0000 (-0800)
Subject: am 208c7569: (-s ours) am 0dd85d89: (-s ours) Only apply permission to files with... 
X-Git-Tag: android-x86-2.2~248^2^2~36
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6efbd4a1e67226f76f11ef75443828d29f22e2ad;p=android-x86%2Fsdk.git

am 208c7569: (-s ours) am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)

Merge commit '208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-mr2

* commit '208c75697e483f63f6075f28c1fc4ff49382f884':
  Only apply permission to files with +x (do not merge)
---

6efbd4a1e67226f76f11ef75443828d29f22e2ad