am c280ddca: (-s ours) am 9e6d2ee0: DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.

* commit 'c280ddca709cef53852600404919b757404f568e':
  DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
This commit is contained in:
Tim Kilbourn 2015-06-05 00:47:28 +00:00 committed by Android Git Automerger
commit 7678a4bdf3

Diff Content Not Available