Maurice Lam befc1267a5 am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev ...

* commit '4e8a7219c866030b5870c9d8e0fa930423761048':
  [FRP] Open the lock setup screens in same task

2014-12-15 17:56:32 +00:00

res

Import translations. DO NOT MERGE

2014-12-15 06:42:32 -08:00

src/com/android/settings

resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

2014-12-15 16:27:39 +00:00

tests

resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

2014-12-15 16:27:39 +00:00

Android.mk

Settings psuedolocalization fixes.

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

AndroidManifest.xml

[FRP] Open the lock setup screens in same task

2014-12-11 18:22:08 -08: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%