Amith Yamasani d0a3f8727f am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev ...

* commit 'd04e36e6f2259747dac4c4a1fa0393f72dc078af':
  Fix inconsistent text in Settings>Security>Screen lock

2013-08-09 06:06:52 -07:00

res

am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev

2013-08-09 06:06:52 -07:00

src/com/android/settings

Merge "Potential fix for Bug: 10241642" into klp-dev

2013-08-08 23:14:03 +00:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

The Settings app needs privileged permissions

2013-06-17 11:43:23 -07:00

AndroidManifest.xml

Merge "Finished the location settings"

2013-08-08 00:55:39 +00:00

CleanSpec.mk

Add an empty CleanSpec.mk

2010-03-08 18:05:08 -08: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

NFC payment settings.

2013-08-06 19:16:54 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%