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

am: 61da13a57f Change-Id: I38702eb8b5e7a8455cc2a531e5c0fffaa4d955cc
2016-06-08 15:56:46 +00:00
parent ab1eed7f6f 61da13a57f
commit ae3269accd
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 {