Wink Saville bca457c60f am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev ...

automerge: cb02b97

* commit 'cb02b97f8dc972e0438492b1cadaa21b34a301b6':
  Change subId to int from long

2014-10-27 21:36:17 +00:00

res

Import translations. DO NOT MERGE

2014-10-27 09:43:16 -07:00

src/com/android/settings

Merge "Change subId to int from long" into lmp-mr1-dev

2014-10-27 17:35:44 +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

Add a checkbox option to 'require password to decrypt'

2014-10-14 18:40:30 -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

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%