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

Merge commit '208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-plus-aosp

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