| commit | da8b02f77cc4df1d0cfc4127687404bafa031991 | [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 | bad1853da59d50bf71bf683057dea7aa0d7703a5 | |
| parent | 858b93c0fd24f9ee5158247e1deedaf8b239a941 [diff] | |
| parent | ae5ace55d9fc45bc11608c9fb59c9ee884fd9ea6 [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.