tree 16bc1a2dc914a610641ac65ab8df022a388f8d1c
parent 1df6d93064c3e43356869407eff41a03bc9ca4b8
parent 46f7d54cbda931213bbe710c065e1bd82aa0af6c
author Dan Bornstein <danfuzz@android.com> 1284403930 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284403930 -0700

am 46f7d54c: We also need to tell it the file mode when creating the output.

Merge commit '46f7d54cbda931213bbe710c065e1bd82aa0af6c' into gingerbread-plus-aosp

* commit '46f7d54cbda931213bbe710c065e1bd82aa0af6c':
  We also need to tell it the file mode when creating the output.