resolve merge conflicts of 6aa6ddb to nyc-dev

Change-Id: I3696fe3e86e0222c7c26b0aa2bf1dd8e03ac5315
This commit is contained in:
Alain Vongsouvanh 2016-06-08 08:30:48 -07:00
commit 771b6eb8d9

View file

@ -245,7 +245,7 @@ void WearRecoveryUI::progress_loop() {
if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING) if ((currentIcon == INSTALLING_UPDATE || currentIcon == ERASING)
&& !show_text) { && !show_text) {
if (!intro_done) { if (!intro_done) {
if (current_frame == intro_frames - 1) { if (current_frame >= intro_frames - 1) {
intro_done = true; intro_done = true;
current_frame = 0; current_frame = 0;
} else { } else {