resolve merge conflicts of 6aa6ddb to nyc-dev

am: 771b6eb8d9 Change-Id: Ie0dabf5fb0930b75117193ae31e73df62d885903
2016-06-08 15:46:40 +00:00
parent 64f46fb16c 771b6eb8d9
commit 2a697feb39
1 changed files with 1 additions and 1 deletions
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -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 {