Jim Miller 09ba0da87f am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev ...

* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
  Add a checkbox option to 'require password to decrypt'

2014-10-15 18:26:59 +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

Put in real "code" (aka marketing) name.

2014-10-07 20:17:19 -07:00

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

Add a checkbox option to 'require password to decrypt'

2014-10-14 16:26:11 -07:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

…