Kenny Root 9ca6d71c52 resolved conflicts for merge of c6bf3eaa to master ...

Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac

2010-10-15 11:20:42 -07:00

..

AlarmClock.java

…

Applications.java

…

BaseColumns.java

…

Browser.java

…

BrowserContract.java

…

Calendar.java

…

CallLog.java

…

Contacts.java

…

ContactsContract.java

…

Downloads.java

bug:3069735 in Download UI app, handle deletes correctly

2010-10-13 16:18:44 -07:00

DrmStore.java

…

LiveFolders.java

…

MediaStore.java

…

Mtp.java

…

OpenableColumns.java

…

package.html

…

SearchRecentSuggestions.java

…

Settings.java

Fix 3024528: Add owner info to SecureSettings.

2010-10-14 15:51:55 -07:00

SocialContract.java

…

SyncConstValue.java

…

SyncStateContract.java

…

Telephony.java

…

UserDictionary.java

…