Jason Monk 24f6a0eebc Merge "Fix activity weirdness by doing the right thing" into nyc-dev ...

am: db26d19302

* commit 'db26d19302ea7b0bd169907809b58044e7fbff10':
  Fix activity weirdness by doing the right thing

2016-02-10 18:06:56 +00:00

res

Merge "Reworks lock screen flows." into nyc-dev

2016-02-10 18:06:47 +00:00

src/com/android/settings

Merge "Fix activity weirdness by doing the right thing" into nyc-dev

2016-02-10 17:57:28 +00:00

tests

Import translations. DO NOT MERGE

2016-02-10 07:48:36 -08:00

Android.mk

Enable multi-dex for incremental settings builds

2016-01-29 15:15:18 -08:00

AndroidManifest.xml

Merge "Make TetherSettings use the new tether api."

2016-02-05 18:14:50 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07: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

Reworks lock screen flows.

2016-02-09 11:58:12 -08:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%