am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2

* commit '5c8caba2e590792531ffb2c9f4ea924993662abd':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
This commit is contained in:
Dianne Hackborn 2011-05-20 16:13:54 -07:00 committed by Android Git Automerger
commit 5159fb14ad

Diff Content Not Available