diff --git a/src/Main/FrameBufferAndroid.hpp b/src/Main/FrameBufferAndroid.hpp
index 359cea9..2e567d8 100644
--- a/src/Main/FrameBufferAndroid.hpp
+++ b/src/Main/FrameBufferAndroid.hpp
@@ -9,26 +9,26 @@
 
 namespace sw
 {
-    class FrameBufferAndroid : public FrameBuffer
-    {
-    public:
-        FrameBufferAndroid(ANativeWindow* window, int width, int height);
+	class FrameBufferAndroid : public FrameBuffer
+	{
+	public:
+		FrameBufferAndroid(ANativeWindow* window, int width, int height);
 
-        ~FrameBufferAndroid();
+		~FrameBufferAndroid();
 
-        void flip(void *source, Format sourceFormat, size_t sourceStride) override {blit(source, 0, 0, sourceFormat, sourceStride);};
+		void flip(void *source, Format sourceFormat, size_t sourceStride) override {blit(source, 0, 0, sourceFormat, sourceStride);};
 		void blit(void *source, const Rect *sourceRect, const Rect *destRect, Format sourceFormat, size_t sourceStride) override;
 
 		void *lock() override;
 		void unlock() override;
 
-        bool setSwapRectangle(int l, int t, int w, int h);
+		bool setSwapRectangle(int l, int t, int w, int h);
 
-    private:
-        ANativeWindow* nativeWindow;
-        ANativeWindowBuffer* buffer;
-        gralloc_module_t const* gralloc;
-    };
+	private:
+		ANativeWindow* nativeWindow;
+		ANativeWindowBuffer* buffer;
+		gralloc_module_t const* gralloc;
+	};
 }
 
 #endif   // sw_FrameBufferAndroid
