| commit | 5159fb14adb37880437a5d0715e88842615431cb | [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 | cc49bbb8abf379490d8a487b9e8b36e43e5ecb3b | |
| parent | 70b1bea6e1a389e15604ec2c78d2d374aeb0b945 [diff] | |
| parent | 7e4c1982d3dee7791e1bffffd06c92c05d2975d6 [diff] |
am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 * commit '5c8caba2e590792531ffb2c9f4ea924993662abd': Add ParcelFileDescriptor.fromFd() and .adoptFd().