Amith Yamasani e7f89b6bfc am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev ...

* commit '6707999600129286ad362bfc2974e321ff06ec90':
  Handle disallowed NFC beam restriction

2014-09-09 20:35:48 +00:00

res

am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev

2014-09-09 11:12:09 +00:00

src/com/android/settings

Merge "Handle disallowed NFC beam restriction" into lmp-dev

2014-09-09 20:30:36 +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

Merge "Splits out ACTION_MAIN intent filter for Settings and doesn't forward it." into lmp-dev

2014-09-08 19:13:10 +00: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

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%