commit c4bd7211373cf5b745c7d4f849f43f7a2d2b1141
author Naveen Leekha <leekha@google.com> Thu Sep 24 15:55:21 2015 -0700
committer Naveen Leekha <leekha@google.com> Thu Sep 24 15:55:21 2015 -0700
tree 2a76f16e90d40795bfb26d9d239cd2431c619051
parent e889592e33891c9b88ff6ba655426118f8ef12ee

resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

Change-Id: I543df164076b44578b14d41031800bb62b81586d

libs/gui/IGraphicBufferProducer.cpp

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index d09eba0..74a40ee 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -324,7 +324,7 @@
             uint32_t height = data.readUint32();
             PixelFormat format = static_cast<PixelFormat>(data.readInt32());
             uint32_t usage = data.readUint32();
-            int buf;
+            int buf = 0;
             sp<Fence> fence;
             int result = dequeueBuffer(&buf, &fence, async, width, height,
                     format, usage);
@@ -392,7 +392,7 @@
         }
         case QUERY: {
             CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
-            int value;
+            int value = 0;
             int what = data.readInt32();
             int res = query(what, &value);
             reply->writeInt32(value);