Android CTS 5.0 Release 7 (2906672)
am 294ecd05: Merge "Added the Samsung Galaxy family VID and PID."

* commit '294ecd05e897bf60912818a9d1805a4f651dc0bd':