wrong branch

...

 Changes to be committed:
	deleted:    CleanSpec.mk
	modified:   build/phone-hdpi-512-dalvik-heap.mk
	modified:   build/phone-hdpi-dalvik-heap.mk
	modified:   build/phone-xhdpi-1024-dalvik-heap.mk
	modified:   build/tablet-7in-hdpi-1024-dalvik-heap.mk
	modified:   build/tablet-dalvik-heap.mk
	modified:   cmds/dumpstate/dumpstate.c
	modified:   cmds/dumpstate/utils.c
	modified:   data/etc/android.hardware.camera.autofocus.xml
	modified:   data/etc/android.hardware.camera.flash-autofocus.xml
	modified:   data/etc/android.hardware.camera.front.xml
	modified:   data/etc/android.hardware.camera.xml
	modified:   include/android/configuration.h
	modified:   include/android/keycodes.h
	modified:   include/binder/IMemory.h
	modified:   include/binder/IPCThreadState.h
	modified:   include/binder/MemoryHeapBase.h
	deleted:    include/binder/MemoryHeapIon.h
	modified:   include/binder/Parcel.h
	modified:   include/binder/PermissionCache.h
	modified:   include/gui/BufferQueue.h
	modified:   include/gui/DisplayEventReceiver.h
	modified:   include/gui/IGraphicBufferAlloc.h
	modified:   include/gui/ISurfaceComposer.h
	modified:   include/gui/ISurfaceComposerClient.h
	modified:   include/gui/ISurfaceTexture.h
	modified:   include/gui/Sensor.h
	modified:   include/gui/Surface.h
	modified:   include/gui/SurfaceComposerClient.h
	modified:   include/gui/SurfaceTexture.h
	modified:   include/gui/SurfaceTextureClient.h
	modified:   include/media/editor/II420ColorConverter.h
	modified:   include/media/hardware/HardwareAPI.h
	modified:   include/media/openmax/OMX_IVCommon.h
	modified:   include/private/gui/ComposerService.h
	modified:   include/private/gui/LayerState.h
	deleted:    include/private/gui/SharedBufferStack.h
	modified:   include/private/ui/RegionHelper.h
	modified:   include/ui/DisplayInfo.h
	modified:   include/ui/FramebufferNativeWindow.h
	modified:   include/ui/GraphicBuffer.h
	modified:   include/ui/GraphicBufferAllocator.h
	modified:   include/ui/GraphicBufferMapper.h
	modified:   include/ui/Point.h
	modified:   include/ui/Rect.h
	modified:   include/ui/Region.h
	modified:   include/utils/Flattenable.h
	modified:   include/utils/KeyedVector.h
	modified:   include/utils/Log.h
	modified:   include/utils/SharedBuffer.h
	modified:   include/utils/Singleton.h
	modified:   include/utils/SortedVector.h
	modified:   include/utils/SystemClock.h
	modified:   include/utils/Timers.h
	modified:   include/utils/Trace.h
	modified:   include/utils/Vector.h
	modified:   include/utils/misc.h
	modified:   libs/binder/Android.mk
	modified:   libs/binder/IMemory.cpp
	modified:   libs/binder/IPCThreadState.cpp
	modified:   libs/binder/MemoryHeapBase.cpp
	modified:   libs/binder/MemoryHeapBaseIon.cpp
	deleted:    libs/binder/MemoryHeapIon.cpp
	modified:   libs/binder/Parcel.cpp
	modified:   libs/gui/Android.mk
	modified:   libs/gui/BufferQueue.cpp
	modified:   libs/gui/IGraphicBufferAlloc.cpp
	modified:   libs/gui/ISensorServer.cpp
	modified:   libs/gui/ISurfaceComposer.cpp
	modified:   libs/gui/ISurfaceComposerClient.cpp
	modified:   libs/gui/ISurfaceTexture.cpp
	modified:   libs/gui/LayerState.cpp
	modified:   libs/gui/Sensor.cpp
	modified:   libs/gui/Surface.cpp
	modified:   libs/gui/SurfaceComposerClient.cpp
	modified:   libs/gui/SurfaceTexture.cpp
	modified:   libs/gui/SurfaceTextureClient.cpp
	modified:   libs/gui/tests/Android.mk
	modified:   libs/gui/tests/SurfaceTextureClient_test.cpp
	modified:   libs/gui/tests/SurfaceTexture_test.cpp
	modified:   libs/gui/tests/Surface_test.cpp
	modified:   libs/ui/Android.mk
	modified:   libs/ui/FramebufferNativeWindow.cpp
	modified:   libs/ui/GraphicBuffer.cpp
	modified:   libs/ui/GraphicBufferAllocator.cpp
	modified:   libs/ui/GraphicBufferMapper.cpp
	modified:   libs/ui/Region.cpp
	modified:   libs/utils/Android.mk
	modified:   libs/utils/LinearTransform.cpp
	modified:   libs/utils/SystemClock.cpp
	modified:   libs/utils/Timers.cpp
	modified:   libs/utils/Trace.cpp
	modified:   libs/utils/VectorImpl.cpp
	modified:   libs/utils/ZipFileRO.cpp
	modified:   libs/utils/misc.cpp
	modified:   opengl/include/EGL/eglext.h
	modified:   opengl/libagl/Android.mk
	modified:   opengl/libagl/egl.cpp
	modified:   opengl/libagl/light.cpp
	modified:   opengl/libs/Android.mk
	modified:   opengl/libs/EGL/egl.cpp
	modified:   opengl/libs/EGL/eglApi.cpp
	modified:   opengl/libs/EGL/egl_cache.cpp
	modified:   opengl/libs/EGL/egl_display.cpp
	modified:   opengl/libs/EGL/egl_entries.in
	modified:   opengl/libs/EGL/trace.cpp
	modified:   opengl/libs/GLES2/gl2.cpp
	modified:   opengl/libs/GLES_trace/src/gltrace_context.cpp
	modified:   opengl/libs/GLES_trace/src/gltrace_context.h
	modified:   opengl/libs/GLES_trace/src/gltrace_fixup.cpp
	modified:   opengl/specs/README
	modified:   opengl/tests/Android.mk
	modified:   opengl/tests/hwc/hwcColorEquiv.cpp
	modified:   opengl/tests/hwc/hwcCommit.cpp
	modified:   opengl/tests/hwc/hwcRects.cpp
	modified:   opengl/tests/hwc/hwcStress.cpp
	modified:   opengl/tests/hwc/hwcTestLib.cpp
	modified:   opengl/tests/hwc/hwcTestLib.h
	modified:   opengl/tools/glgen/gen
	modified:   opengl/tools/glgen/src/CFunc.java
	modified:   opengl/tools/glgen/src/CType.java
	modified:   opengl/tools/glgen/src/JType.java
	modified:   opengl/tools/glgen/src/JniCodeEmitter.java
	modified:   opengl/tools/glgen/stubs/gles11/GLES10ExtcHeader.cpp
	modified:   opengl/tools/glgen/stubs/gles11/GLES10cHeader.cpp
	modified:   opengl/tools/glgen/stubs/gles11/GLES11ExtcHeader.cpp
	modified:   opengl/tools/glgen/stubs/gles11/GLES11cHeader.cpp
	modified:   opengl/tools/glgen/stubs/gles11/GLES20cHeader.cpp
	modified:   opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp
	modified:   opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl
	modified:   services/powermanager/IPowerManager.cpp
	modified:   services/surfaceflinger/Android.mk
	modified:   services/surfaceflinger/DdmConnection.cpp
	modified:   services/surfaceflinger/DdmConnection.h
	deleted:    services/surfaceflinger/DisplayHardware/DisplayHardware.cpp
	deleted:    services/surfaceflinger/DisplayHardware/DisplayHardware.h
	deleted:    services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
	deleted:    services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h
	modified:   services/surfaceflinger/DisplayHardware/HWComposer.cpp
	modified:   services/surfaceflinger/DisplayHardware/HWComposer.h
	modified:   services/surfaceflinger/EventThread.cpp
	modified:   services/surfaceflinger/EventThread.h
	modified:   services/surfaceflinger/Layer.cpp
	modified:   services/surfaceflinger/Layer.h
	modified:   services/surfaceflinger/LayerBase.cpp
	modified:   services/surfaceflinger/LayerBase.h
	modified:   services/surfaceflinger/LayerDim.cpp
	modified:   services/surfaceflinger/LayerDim.h
	modified:   services/surfaceflinger/LayerScreenshot.cpp
	modified:   services/surfaceflinger/LayerScreenshot.h
	modified:   services/surfaceflinger/MessageQueue.cpp
	modified:   services/surfaceflinger/MessageQueue.h
	modified:   services/surfaceflinger/SurfaceFlinger.cpp
	modified:   services/surfaceflinger/SurfaceFlinger.h
	modified:   services/surfaceflinger/Transform.cpp
	modified:   services/surfaceflinger/tests/Transaction_test.cpp
	modified:   services/surfaceflinger/tests/resize/resize.cpp
	modified:   services/surfaceflinger/tests/screencap/screencap.cpp
	modified:   services/surfaceflinger/tests/surface/surface.cpp