diff options
| author | 2014-11-22 00:35:09 +0000 | |
|---|---|---|
| committer | 2014-11-22 00:35:09 +0000 | |
| commit | 64bb413a664001c95c8439cf097dc3033f4ed733 (patch) | |
| tree | d4562f7bb5656865d32e5d684b5a41542ecfaf58 /libs/hwui/Program.h | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
Revert "resolved conflicts for merge of 220c3f4f to master"
Reverted as hwui doesn't agree.
This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.
Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
Diffstat (limited to 'libs/hwui/Program.h')
| -rw-r--r-- | libs/hwui/Program.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/hwui/Program.h b/libs/hwui/Program.h index fc7d13410f5c..d05b331909e2 100644 --- a/libs/hwui/Program.h +++ b/libs/hwui/Program.h @@ -281,8 +281,6 @@ struct ProgramDescription { programid k = key(); PROGRAM_LOGD("%s (key = 0x%.8x%.8x)", message, uint32_t(k >> 32), uint32_t(k & 0xffffffff)); -#else - (void)message; #endif } |