am ca7b1210: am ea56499d: Merge "Potential NPE in SQLiteConnection"

# By Sylvain Becuwe
# Via Android Git Automerger (1) and others
* commit 'ca7b1210292c2fc80fd40f1f4c8662a1faf0b7a5':
  Potential NPE in SQLiteConnection

core/java/android/database/sqlite/SQLiteConnection.java

@@ -974,7 +974,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
         if (count != statement.mNumParameters) {
             throw new SQLiteBindOrColumnIndexOutOfRangeException(
                     "Expected " + statement.mNumParameters + " bind arguments but "
-                    + bindArgs.length + " were provided.");
+                    + count + " were provided.");
         }
         if (count == 0) {
             return;