resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp

Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/hwui/tests/main.cpp b/libs/hwui/tests/main.cpp
index 2d99e9f..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
@@ -111,7 +111,7 @@ int main(int argc, char* argv[]) {
 
     for (int i = 0; i < 150; i++) {
         ATRACE_NAME("UI-Draw Frame");
-        for (int ci = 0; ci < cards.size(); ci++) {
+        for (size_t ci = 0; ci < cards.size(); ci++) {
             cards[ci]->mutateStagingProperties().setTranslationX(i);
             cards[ci]->mutateStagingProperties().setTranslationY(i);
             cards[ci]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);