Merge "Fix ES2 composition on some devices" into klp-dev

author Mathias Agopian <mathias@google.com>

Thu, 15 Aug 2013 23:12:26 +0000 (23:12 +0000)

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

Thu, 15 Aug 2013 23:12:26 +0000 (23:12 +0000)
author Mathias Agopian <mathias@google.com>
Thu, 15 Aug 2013 23:12:26 +0000 (23:12 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 15 Aug 2013 23:12:26 +0000 (23:12 +0000)
diff --cc services/surfaceflinger/RenderEngine/ProgramCache.cpp
Simple merge
author	Mathias Agopian <mathias@google.com>
	Thu, 15 Aug 2013 23:12:26 +0000 (23:12 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 15 Aug 2013 23:12:26 +0000 (23:12 +0000)