Merge "Create first class unbounded ColorOp" into nyc-dev

author Chris Craik <ccraik@google.com>

Sat, 26 Mar 2016 00:26:11 +0000 (00:26 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 26 Mar 2016 00:26:12 +0000 (00:26 +0000)
author Chris Craik <ccraik@google.com>
Sat, 26 Mar 2016 00:26:11 +0000 (00:26 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 26 Mar 2016 00:26:12 +0000 (00:26 +0000)
diff --cc libs/hwui/tests/unit/FrameBuilderTests.cpp
Simple merge
author	Chris Craik <ccraik@google.com>
	Sat, 26 Mar 2016 00:26:11 +0000 (00:26 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 26 Mar 2016 00:26:12 +0000 (00:26 +0000)