Merge "Keep native callbacks when primary SQLiteConnection is recreated"

author Jeffrey Brown <jeffbrown@android.com>

Thu, 7 Feb 2013 04:15:31 +0000 (04:15 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 7 Feb 2013 04:15:32 +0000 (04:15 +0000)
author Jeffrey Brown <jeffbrown@android.com>
Thu, 7 Feb 2013 04:15:31 +0000 (04:15 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 7 Feb 2013 04:15:32 +0000 (04:15 +0000)
diff --cc core/java/android/database/sqlite/SQLiteConnection.java
Simple merge
author	Jeffrey Brown <jeffbrown@android.com>
	Thu, 7 Feb 2013 04:15:31 +0000 (04:15 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 7 Feb 2013 04:15:32 +0000 (04:15 +0000)