commit ffd03d1ea3969f3e8b4831d95a279f165f6fbfa7
author The Android Automerger <android-build@google.com> Thu Jun 09 00:02:48 2016 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 09 00:02:48 2016 -0700
tree 59cca0039f0daff64462f108cbe1404a679e4dd1
parent 771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd
parent fad32b1b0a5c3f4a3cf2a88fed0fdcee1b18e0d8

merge in nyc-release history after reset to nyc-dev

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 {