OSDN Git Service

Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev
authorTim Kilbourn <tkilbourn@google.com>
Thu, 4 Jun 2015 21:40:14 +0000 (21:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Jun 2015 21:40:15 +0000 (21:40 +0000)

Trivial merge