commit 61da13a57f0bb13fff93e89324e52fe61b14570f
author Alain Vongsouvanh <alainv@google.com> Wed Jun 08 15:51:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 08 15:51:48 2016 +0000
tree 8adc9cf251eaac1c5c6964941c594db549e8dc26
parent df956eceefb6bf7addc0057572741237cacdfa12
parent 2a697feb3931a053a5c72913a461db7210119087

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

Change-Id: Id1dcd42164121b4c31089c47fb56fb317da19896

wear_ui.cpp

diff --git a/wear_ui.cpp b/wear_ui.cpp
index 5451ed1..e078134 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 {