Jason Monk afeb044afc resolved conflicts for merge of 336c4666 to master ...

Change-Id: I350b3ecadce490b62c92c0e7b1d555825d035f87

2015-01-05 16:37:46 -05:00

..

res

Show saved networks in QS sub-panel.

2015-01-05 14:33:26 -05:00

src/com/android/systemui

resolved conflicts for merge of 336c4666 to master

2015-01-05 16:37:46 -05:00

tests

resolved conflicts for merge of 336c4666 to master

2015-01-05 16:37:46 -05:00

Android.mk

…

AndroidManifest.xml

Fixing major regressions in Recents with multi-user. (Bug 18574950)

2014-12-10 15:16:55 -08:00

lint.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

…