commit | 91d78acbd39ab0235daa46c61742a371266bd003 | [log] [tgz] |
---|---|---|
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 | 9de1604337a4a12972bcf11ca913ab6631bf027a | |
parent | 1afa4d7b23ce8b9852cda1f495145f320414c3d4 [diff] | |
parent | 771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd [diff] |
resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 Change-Id: Icc7290bbdf7b7420bab34b56f4e368f93b007053
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 {