diff options
| author | 2014-11-21 15:51:04 -0800 | |
|---|---|---|
| committer | 2014-11-21 15:51:04 -0800 | |
| commit | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (patch) | |
| tree | 7a1842dd8f8b9b8e1880df7a3fe0fc7f5d103d48 /libs/hwui/Program.h | |
| parent | fa6547f6c0aad15c308a4ba946955087081ae1eb (diff) | |
| parent | 220c3f4f48b53b6010093a1ef437f4197a382ebf (diff) | |
resolved conflicts for merge of 220c3f4f to master
Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e
Diffstat (limited to 'libs/hwui/Program.h')
| -rw-r--r-- | libs/hwui/Program.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/hwui/Program.h b/libs/hwui/Program.h index d05b331909e2..fc7d13410f5c 100644 --- a/libs/hwui/Program.h +++ b/libs/hwui/Program.h @@ -281,6 +281,8 @@ 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 } |