app_Settings

Go to file

Andres Morales 7d3e182c18 Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9

automerge: eb55ac9

* commit 'eb55ac90dd8034a64ac146c4f4829b1e8bab1d17':
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock

2014-11-05 18:08:26 +00:00

res

Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9

2014-11-05 18:08:26 +00:00

src/com/android/settings

Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev

2014-11-05 16:31:54 +00:00

tests

Import translations. DO NOT MERGE

2014-08-24 13:07:11 -07:00

Android.mk

Settings psuedolocalization fixes.

2014-08-22 12:24:00 -07:00

AndroidManifest.xml

Added IMEI status activity.

2014-10-28 13:00:11 -07:00

CleanSpec.mk

Finally, a place for notification settings.

2014-03-12 14:15:09 -04:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

proguard.flags

VolumeZen: Sound & Notifications settings.

2014-05-18 15:37:09 -04:00