Merge "Silence a compiler warning about an unused variable in `hprof-conv`." am: 5a81c499a5 am: f95cfdb1df

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215

Change-Id: I81ca0154f03e845eb87864f7b842f941a2930923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/hprof-conv/HprofConv.c b/tools/hprof-conv/HprofConv.c
index cc90176..c8847c9 100644
--- a/tools/hprof-conv/HprofConv.c
+++ b/tools/hprof-conv/HprofConv.c
@@ -663,7 +663,8 @@
 
         unsigned char* buf = ebGetBuffer(pBuf);
         unsigned char type;
-        unsigned int timestamp, length;
+        unsigned int timestamp ATTRIBUTE_UNUSED;
+        unsigned int length;
 
         type = buf[0];
         timestamp = get4BE(buf + 1);