| commit | 7e4c1982d3dee7791e1bffffd06c92c05d2975d6 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri May 20 14:32:35 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 20 14:32:35 2011 -0700 |
| tree | b74c15576207a21591c20da12c9b6dfc2bf5faf0 | |
| parent | 26e447eff3b3b3e8e53a0e45d46fd4b2ee226d87 [diff] | |
| parent | cbc706222f0eeb81ba92aebfc943fbdb514e3232 [diff] |
am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 * commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6': Add ParcelFileDescriptor.fromFd() and .adoptFd().