Narayan Kamath 13df2564af am 62d35b65: resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp ...

* commit '62d35b65f236e494520d7ca480e502c79f5f4fe3':
  Stop using apache-http in settings.

2014-12-15 19:02:26 +00:00

res

Import translations. DO NOT MERGE

2014-12-15 06:53:16 -08:00

src/com/android/settings

am a6f6e5a3: am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev

2014-12-15 18:46:24 +00:00

tests

Stop using apache-http in settings.

2014-12-15 14:32:38 +00: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%