Jason Monk 8efeae7eb4 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev ...

automerge: 5c69f5b

* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure

2014-11-03 14:42:18 +00:00

..

res

am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev

2014-10-23 08:01:57 +00:00

src/com/android/providers/settings

Move LOCK_TO_APP_EXIT_LOCKED from System to Secure

2014-10-31 14:47:13 -04:00

Android.mk

IMS:change enhanced 4g setting to store in setting db.

2014-10-15 16:12:39 -07:00

AndroidManifest.xml

Marking the Settings ContentProvider as singleUser

2014-08-22 12:12:29 +01:00

MODULE_LICENSE_APACHE2

…

NOTICE

…