am b93bca5d: am a59d7a6a: Merge "GUI: Remove unused variables"

* commit 'b93bca5d0831068cd599f905ba43dc8334095d65':
  GUI: Remove unused variables

diff --cc libs/gui/CpuConsumer.cpp
index 45c896b,48c159d..d74d06c
--- 1/libs/gui/CpuConsumer.cpp
--- 2/libs/gui/CpuConsumer.cpp
+++ b/libs/gui/CpuConsumer.cpp
@@@ -194,10 -194,9 +194,9 @@@ status_t CpuConsumer::lockNextBuffer(Lo
  status_t CpuConsumer::unlockBuffer(const LockedBuffer &nativeBuffer) {
      Mutex::Autolock _l(mMutex);
      size_t lockedIdx = 0;
-     status_t err;
  
      void *bufPtr = reinterpret_cast<void *>(nativeBuffer.data);
 -    for (; lockedIdx < mMaxLockedBuffers; lockedIdx++) {
 +    for (; lockedIdx < static_cast<size_t>(mMaxLockedBuffers); lockedIdx++) {
          if (bufPtr == mAcquiredBuffers[lockedIdx].mBufferPointer) break;
      }
      if (lockedIdx == mMaxLockedBuffers) {

diff --cc libs/gui/ISurfaceComposer.cpp
index 36ddb13,00173c7..78886d5
--- 1/libs/gui/ISurfaceComposer.cpp
--- 2/libs/gui/ISurfaceComposer.cpp
+++ b/libs/gui/ISurfaceComposer.cpp
@@@ -51,11 -51,8 +51,10 @@@ public
      {
      }
  
 +    virtual ~BpSurfaceComposer();
 +
      virtual sp<ISurfaceComposerClient> createConnection()
      {
-         uint32_t n;
          Parcel data, reply;
          data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
          remote()->transact(BnSurfaceComposer::CREATE_CONNECTION, data, &reply);

diff --cc libs/gui/Surface.cpp
Simple merge