Wink Saville 40aca89a27 am c501947a: Merge commit \'edd57a98\' into fix-conflict ...

* commit 'c501947a3ebed84792c235f29c73194d095906ed':

2014-09-19 06:44:44 +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

…

DocumentsContract.java

…

DocumentsProvider.java

…

Downloads.java

…

LiveFolders.java

…

MediaStore.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

am b5f388f8: am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev

2014-09-12 19:17:02 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

…