From 64bb413a664001c95c8439cf097dc3033f4ed733 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Sat, 22 Nov 2014 00:35:09 +0000
Subject: Revert "resolved conflicts for merge of 220c3f4f to master"

Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
---
 libs/hwui/tests/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libs/hwui/tests')

diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp
index d847d13..64ee5f6 100644
--- a/libs/hwui/tests/main.cpp
+++ b/libs/hwui/tests/main.cpp
@@ -66,7 +66,7 @@ sp<RenderNode> createCard(int x, int y, int width, int height) {
     return node;
 }
 
-int main() {
+int main(int argc, char* argv[]) {
     createTestEnvironment();
 
     // create the native surface
-- 
cgit v1.1