resolve merge conflicts of 6aa6ddb to nyc-dev

am: 771b6eb8d9

Change-Id: Icc7290bbdf7b7420bab34b56f4e368f93b007053
This commit is contained in:
Alain Vongsouvanh 2016-06-08 15:46:40 +00:00 committed by android-build-merger
commit 91d78acbd3

View file

@ -245,7 +245,7 @@ void WearRecoveryUI::progress_loop() {
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 {