merge from open-source master

Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101

diff --cc core/java/android/database/sqlite/SQLiteCursor.java
Simple merge

diff --cc core/java/android/database/sqlite/SQLiteDatabase.java
Simple merge

diff --cc core/java/android/database/sqlite/SQLiteProgram.java
index 89a5f0d,d6aa9e6..4d96f12
--- 1/core/java/android/database/sqlite/SQLiteProgram.java
--- 2/core/java/android/database/sqlite/SQLiteProgram.java
+++ b/core/java/android/database/sqlite/SQLiteProgram.java
@@@ -20,20 -20,16 +20,23 @@@ import android.util.Log
  
  /**
   * A base class for compiled SQLite programs.
+  *
+  * SQLiteProgram is not internally synchronized so code using a SQLiteProgram from multiple
+  * threads should perform its own synchronization when using the SQLiteProgram.
   */
  public abstract class SQLiteProgram extends SQLiteClosable {
 +
      private static final String TAG = "SQLiteProgram";
  
 -    /** The database this program is compiled against. */
 +    /** The database this program is compiled against.
 +     * @deprecated do not use this
 +     */
 +    @Deprecated
      protected SQLiteDatabase mDatabase;
  
 +    /** The SQL used to create this query */
 +    /* package */ final String mSql;
 +
      /**
       * Native linkage, do not modify. This comes from the database and should not be modified
       * in here or in the native code.

diff --cc core/java/android/database/sqlite/SQLiteQuery.java
Simple merge

diff --cc core/java/android/database/sqlite/SQLiteStatement.java
Simple merge