commit 771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd
author Alain Vongsouvanh <alainv@google.com> Wed Jun 08 08:30:48 2016 -0700
committer Alain Vongsouvanh <alainv@google.com> Wed Jun 08 08:30:48 2016 -0700
tree 59cca0039f0daff64462f108cbe1404a679e4dd1
parent 7ce287d432dd3a4dc8841fc59e11ee1a0b7808a1
parent 6aa6ddb3c584dbf89739465bf2f703d8e1b28c26

resolve merge conflicts of 6aa6ddb to nyc-dev

Change-Id: I3696fe3e86e0222c7c26b0aa2bf1dd8e03ac5315

wear_ui.cpp

diff --git a/wear_ui.cpp b/wear_ui.cpp
index 2502313..b437fd0 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -245,7 +245,7 @@
         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 {