Mathew Inwood 9a5aa0c251 resolve merge conflicts of b41f50dfd0 to pi-dev-plus-aosp ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I2bcc7f0eee31a1775dd7a5dd0f291d0d37bc1292
Change-Id: I227ce12b7419ce8541a362f98adc50965b779c3b

2018-08-16 10:25:51 +01:00

..

sqlite

resolve merge conflicts of b41f50dfd0 to pi-dev-plus-aosp

2018-08-16 10:25:51 +01:00

AbstractCursor.java

Add @UnsupportedAppUsage annotations

2018-08-10 16:10:20 +01:00

AbstractWindowedCursor.java

Add @UnsupportedAppUsage annotations

2018-08-10 16:10:20 +01:00

BulkCursorDescriptor.java

…

BulkCursorNative.java

…

BulkCursorToCursorAdaptor.java

…

CharArrayBuffer.java

…

ContentObservable.java

…

ContentObserver.java

Add @UnsupportedAppUsage annotations

2018-08-10 16:10:20 +01:00

CrossProcessCursor.java

…

CrossProcessCursorWrapper.java

…

Cursor.java

…

CursorIndexOutOfBoundsException.java

…

CursorJoiner.java

…

CursorToBulkCursorAdaptor.java

…

CursorWindow.aidl

…

CursorWindow.java

Add @UnsupportedAppUsage annotations

2018-08-10 16:10:20 +01:00

CursorWindowAllocationException.java

…

CursorWrapper.java

Add @UnsupportedAppUsage annotations

2018-08-10 16:10:20 +01:00

DatabaseErrorHandler.java

…

DatabaseUtils.java

Add @UnsupportedAppUsage annotations

2018-08-10 16:10:20 +01:00

DataSetObservable.java

…

DataSetObserver.java

…

DefaultDatabaseErrorHandler.java

…

IBulkCursor.java

…

IContentObserver.aidl

…

MatrixCursor.java

Add @UnsupportedAppUsage annotations

2018-08-10 16:10:20 +01:00

MergeCursor.java

Fixed typo in MergeCursor

2017-11-15 00:05:04 +00:00

Observable.java

…

OWNERS

Added database package OWNERS

2017-11-28 14:14:37 -08:00

package.html

…

SQLException.java

…

StaleDataException.java

…