diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 15:51:04 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-21 15:51:04 -0800 |
| commit | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (patch) | |
| tree | 7a1842dd8f8b9b8e1880df7a3fe0fc7f5d103d48 /libs/hwui/tests | |
| parent | fa6547f6c0aad15c308a4ba946955087081ae1eb (diff) | |
| parent | 220c3f4f48b53b6010093a1ef437f4197a382ebf (diff) | |
| download | frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.zip frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.tar.gz frameworks_base-8a902d9f24e83c87b054adb5836b4a5b8a257be9.tar.bz2 | |
resolved conflicts for merge of 220c3f4f to master
Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e
Diffstat (limited to 'libs/hwui/tests')
| -rw-r--r-- | libs/hwui/tests/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp index 64ee5f6..d847d13 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 argc, char* argv[]) { +int main() { createTestEnvironment(); // create the native surface |