Maurice Lam 1cca45bc6e Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge: ff649c6 ...

automerge: a1f6660

* commit 'a1f66604233cefd1d4a2b0eab45b76f94770b332':
  [WifiSetup] Don't pan the window for IME

2015-01-20 21:44:58 +00:00

res

am 2399c450: am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev

2015-01-07 12:50:04 +00:00

src/com/android/settings

am edf618c1: am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev

2015-01-16 02:47:55 +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

[WifiSetup] Don't pan the window for IME

2015-01-15 11:55:15 -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%