resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9

am: 2a697feb39 Change-Id: Id1dcd42164121b4c31089c47fb56fb317da19896
2016-06-08 15:51:48 +00:00
parent df956eceef 2a697feb39
commit 61da13a57f
1 changed files with 1 additions and 1 deletions
@@ -245,7 +245,7 @@ void WearRecoveryUI::progress_loop() {
        if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING)
                                                            && !show_text) {
            if (!intro_done) {
-                if (current_frame == intro_frames - 1) {
+                if (current_frame >= intro_frames - 1) {
                    intro_done = true;
                    current_frame = 0;
                } else {