From: Xavier Ducrohet <xav@android.com>
Date: Mon, 2 Nov 2009 21:06:54 +0000 (-0800)
Subject: am ed52a500: (-s ours) am dd43447b: am 208c7569: (-s ours) am 0dd85d89: (-s ours... 
X-Git-Tag: android-x86-2.2~292
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba6a10ad52049dfb7fa5617d1167df872094370b;p=android-x86%2Fsdk.git

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

Merge commit 'ed52a500e34c3c9debd221986cdc89f1c83ce4d2'

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

ba6a10ad52049dfb7fa5617d1167df872094370b