Merge "Add serialVersionUID to Serializable classes"

No match.