Lucky Zhang a62e42be14 am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev ...

automerge: 44f44a0

* commit '44f44a0c54a8467307b55f244866e67bf48d3d62':
  [FRP] Screen Lock for Setup Wizard shows wrong title

2014-12-09 23:15:37 +00:00

res

am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev

2014-12-09 23:15:21 +00:00

src/com/android/settings

am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev

2014-12-09 23:15:29 +00:00

tests

Import translations. DO NOT MERGE

2014-12-08 06:51:46 -08:00

Android.mk

Settings psuedolocalization fixes.

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

AndroidManifest.xml

am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev

2014-12-09 23:15:37 +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%