| commit | ae2500909330eb2ca1beafde04e5bd0259f82c6f | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Oct 28 14:07:27 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 28 14:07:27 2010 -0700 |
| tree | 3caf86b3582c7c14ea4ab9195620ebf922f202f5 | |
| parent | 8e07eca806945d8e576d5ad5120fe25dd7fcfd05 [diff] | |
| parent | a46feff24bc93587f7a945c74838516f7ec1ec85 [diff] |
am ae5ace55: (-s ours) am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread * commit 'ae5ace55d9fc45bc11608c9fb59c9ee884fd9ea6': DO NOT MERGE. Fix asset file descriptor for pipe based fds.