| commit | 070a19e035cd28f2a0cc831f2322f2121d80de44 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri May 20 16:13:54 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 20 16:13:54 2011 -0700 |
| tree | 714d23f6081489a5504fdbe262456f43f4f48c68 | |
| parent | 5a6bec53e224b2db9ecbc6920faab08f4a962256 [diff] | |
| parent | 5c8caba2e590792531ffb2c9f4ea924993662abd [diff] |
am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 * commit '5c8caba2e590792531ffb2c9f4ea924993662abd': Add ParcelFileDescriptor.fromFd() and .adoptFd().