Jeff Tinker 318d335e63 Merge commit 'cf425f5b' into manualmerge
Conflicts:
	proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so
	proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so

Change-Id: I786fa1f8da270acb8d48c515f8fb2f6eb83f9783
2012-05-21 12:32:53 -07:00
Description
No description provided
1.1 GiB