OSDN Git Service

am 208c7569: am 0dd85d89: (-s ours) Only apply permission to files with +x (do not...
authorXavier Ducrohet <xav@android.com>
Mon, 2 Nov 2009 20:45:26 +0000 (12:45 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Nov 2009 20:45:26 +0000 (12:45 -0800)
Merge commit '208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-plus-aosp

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


Trivial merge