diff options
| author | 2014-11-21 14:19:06 -0800 | |
|---|---|---|
| committer | 2014-11-21 14:19:06 -0800 | |
| commit | 2ab8298dc37851aab4623ba3f98d71055d653a73 (patch) | |
| tree | e31d76f1c16ec8e980983392b09287515bcec2f1 /libs/hwui/Program.h | |
| parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 (diff) | |
| parent | 99377df12ee696e01cd9071132f122801a9862ce (diff) | |
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
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 } |