commit 64bb413a664001c95c8439cf097dc3033f4ed733
author Andreas Gampe <agampe@google.com> Sat Nov 22 00:35:09 2014 +0000
committer Andreas Gampe <agampe@google.com> Sat Nov 22 00:35:09 2014 +0000
tree d4562f7bb5656865d32e5d684b5a41542ecfaf58
parent 8a902d9f24e83c87b054adb5836b4a5b8a257be9

Revert "resolved conflicts for merge of 220c3f4f to master"

Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a

libs/hwui/ProgramCache.cpp

diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index a5b9851..62835e0 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -449,7 +449,7 @@
 // Program generation
 ///////////////////////////////////////////////////////////////////////////////
 
-Program* ProgramCache::generateProgram(const ProgramDescription& description, programid /* key */) {
+Program* ProgramCache::generateProgram(const ProgramDescription& description, programid key) {
     String8 vertexShader = generateVertexShader(description);
     String8 fragmentShader = generateFragmentShader(description);