Bryce Lee fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev ...

Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960

2014-10-22 16:56:08 -07:00

..

res

[Theater Mode] framework implementation through global setting

2014-10-21 15:55:55 -07:00

src/com/android/providers/settings

resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev

2014-10-22 16:56:08 -07: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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00