Merge change 8179 into donut

* changes:
  Fix SQL generated by updateWithOnConflict()

core/java/android/database/sqlite/SQLiteDatabase.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1414,6 +1414,7 @@ public class SQLiteDatabase extends SQLiteClosable {
		if (algorithm != null) {
		sql.append("OR ");
		sql.append(algorithm.value());
		sql.append(" ");
		}

		sql.append(table);