| commit | de30d8238551fac957d91be29547f5af35c3bbbd | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sat Jun 27 01:01:04 2015 -0700 |
| committer | The Android Automerger <android-build@google.com> | Sat Jun 27 01:01:04 2015 -0700 |
| tree | 99f87bd70429254e1b49a39c80055764198e5b5c | |
| parent | c3dddce205ef44933813394013ee5ef89b63653b [diff] | |
| parent | 9154748cc5398d5606765d67409c3cfcdb8b7ad6 [diff] |
merge in mnc-release history after reset to mnc-dev
diff --git a/updater/blockimg.c b/updater/blockimg.c index e184800..1e95f4e 100644 --- a/updater/blockimg.c +++ b/updater/blockimg.c
@@ -101,7 +101,7 @@ r2_0 = r2->pos[j * 2]; r2_1 = r2->pos[j * 2 + 1]; - if (!(r2_0 > r1_1 || r1_0 > r2_1)) { + if (!(r2_0 >= r1_1 || r1_0 >= r2_1)) { return 1; } }