OSDN Git Service

am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
authorDianne Hackborn <hackbod@google.com>
Fri, 20 May 2011 21:32:35 +0000 (14:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 May 2011 21:32:35 +0000 (14:32 -0700)
commit5c8caba2e590792531ffb2c9f4ea924993662abd
treeb85f3ac3c1e9c67b4f1f495653a6fc1884c1b1b6
parentdec3dda8730c8d2bd6e45171bf2d83bf89d5d806
parent1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6
am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2

* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().