tree 487c236987816ed350411a8ca7f99a9a21074796
parent 14e45f9b19a846af074d73b3792e35de0448ac21
parent ea2117bdc03316a9292e2344c6fd157c85c13167
author Dianne Hackborn <hackbod@google.com> 1305926923 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1305926923 -0700

Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2