commit 25db8dc7c6c155168f308b2f730198bc5a021e35
author Michael Lentine <mlentine@google.com> Thu Aug 07 22:05:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 06 23:49:20 2014 +0000
tree 6593a42a08bd5bbc633c6fe881d66edc6f650e0d
parent 5a35059600f85f9489f3c1de885aa6188bec07e5
parent b54ee7704e46529e02386cf39eba93a34a527c61

Merge "Change output format to not throw warning on volantis." into lmp-dev

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 6769031..53409d1 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -376,7 +376,7 @@
                     config.ydpi = values[i] / 1000.0f;
                     break;
                 default:
-                    ALOG_ASSERT(false, "unknown display attribute[%d] %#x",
+                    ALOG_ASSERT(false, "unknown display attribute[%zu] %#x",
                             i, DISPLAY_ATTRIBUTES[i]);
                     break;
             }