Merge commit '972f0e3806f379b7fb6e43265f56ddd91c38107e' into eclair-plus-aosp * commit '972f0e3806f379b7fb6e43265f56ddd91c38107e': Add a parcelable version of UUID file.
Merge commit '972f0e3806f379b7fb6e43265f56ddd91c38107e' into eclair-plus-aosp * commit '972f0e3806f379b7fb6e43265f56ddd91c38107e': Add a parcelable version of UUID file.