OSDN Git Service

am ed52a500: (-s ours) am dd43447b: am 208c7569: (-s ours) am 0dd85d89: (-s ours...
authorXavier Ducrohet <xav@android.com>
Mon, 2 Nov 2009 21:06:54 +0000 (13:06 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Nov 2009 21:06:54 +0000 (13:06 -0800)
Merge commit 'ed52a500e34c3c9debd221986cdc89f1c83ce4d2'

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


Trivial merge