tree 5319b8431fc2a4a28e6bd603b6b1ea265956da78
parent b3006d38c6fdb964d9101f38e596e01de3591e56
parent 1b8ef7e3165ff9aa52a4905dafc8d0f83e7403f9
author Jeff Sharkey <jsharkey@android.com> 1428183686 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428183690 +0000

Merge "Parcelable objects for Disk/Volume."