commit ae3269accdb31d47d9b544ff7e2cba6cc20576c3
author Alain Vongsouvanh <alainv@google.com> Wed Jun 08 15:56:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 08 15:56:46 2016 +0000
tree c1e7103b59af5d74eb576ebab7b14d34be5c0e53
parent ab1eed7f6f88bb8d4f08f2ac797a482bd8749982
parent 61da13a57f0bb13fff93e89324e52fe61b14570f

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

Change-Id: I38702eb8b5e7a8455cc2a531e5c0fffaa4d955cc

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 {