am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev

* commit '0505f7f2b5a2e45884a97eeb75c35086a7560c69':
  Terminate loop properly when cursor window is full.

core/java/android/database/DatabaseUtils.java

@@ -270,7 +270,7 @@ public class DatabaseUtils {
         window.setStartPosition(position);
         window.setNumColumns(numColumns);
         if (cursor.moveToPosition(position)) {
-            do {
+            rowloop: do {
                 if (!window.allocRow()) {
                     break;
                 }
@@ -307,7 +307,7 @@ public class DatabaseUtils {
                     }
                     if (!success) {
                         window.freeLastRow();
-                        break;
+                        break rowloop;
                     }
                 }
                 position += 1;