tree 705918914816129a6608e28c1c96ee94e248107d
parent 32d93696ac61c7ca9f63756879dcd07a7f4165bd
parent b10a68c39dfa88face28995ec29942827f6a49bd
author Jason Sams <jsams@google.com> 1376009396 -0700
committer Jason Sams <jsams@google.com> 1376009396 -0700

Merge commit 'b10a68c3' into manualmerge

Conflicts:
	cpu_ref/rsCpuIntrinsicColorMatrix.cpp

Change-Id: Ibc2f1514f8858d99f08380f698bc9ae533c69212