Junda Liu 5716ebe50d Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev ...

automerge: 2eb5a5f

* commit '2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.

2014-11-12 01:14:00 +00:00

..

res

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

2014-10-23 07:55:21 +00:00

src/com/android/providers/settings

Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev

2014-11-12 00:05:20 +00: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

…