Tyler Gunn 6c8d6d74c0 resolved conflicts for merge of 66c16547 to lmp-sprout-dev ...

Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f

2014-09-13 20:10:08 +00:00

..

AlarmClock.java

…

BaseColumns.java

…

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

resolved conflicts for merge of 66c16547 to lmp-sprout-dev

2014-09-13 20:10:08 +00:00

Contacts.java

…

ContactsContract.java

ContactsContract API changes per API review

2014-09-04 16:51:53 -07:00

DocumentsContract.java

Define EXTRA_SIZE for ContentProviders.

2014-08-27 15:13:57 -07:00

DocumentsProvider.java

Define EXTRA_SIZE for ContentProviders.

2014-08-27 15:13:57 -07:00

Downloads.java

…

LiveFolders.java

…

MediaStore.java

Migrate extras to ClipData for image/video capture intents.

2014-07-25 10:22:19 +01:00

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

Merge "Allow device owners to update LOCATION_MODE." into lmp-dev

2014-09-11 15:46:07 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Add TRANSCRIPTION column to Calls table

2014-07-14 10:05:31 -07:00