Christopher Tate f3ac99f2e0 am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev ...

automerge: 68dabad

* commit '68dabada9e6e380ec0c6dacbc2ce7a46aa663a07':
  Exclude ephemeral networks from wifi backup

2015-01-09 20:20:01 +00:00

..

res

Import translations. DO NOT MERGE

2014-12-02 16:50:24 -08:00

src/com/android/providers/settings

Exclude ephemeral networks from wifi backup

2015-01-08 19:05:04 -08: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

…