commit 2a697feb3931a053a5c72913a461db7210119087
author Alain Vongsouvanh <alainv@google.com> Wed Jun 08 15:46:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 08 15:46:40 2016 +0000
tree 22ab385aa7c9a8437e35a96a0f059b1c4cbf7fd7
parent 64f46fb16ccae69f7a826585c5eaba48fe1b05da
parent 771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd

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

Change-Id: Ie0dabf5fb0930b75117193ae31e73df62d885903

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 {