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

Change-Id: I350b3ecadce490b62c92c0e7b1d555825d035f87

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

..

res/layout

…

src/com/android/systemui

resolved conflicts for merge of 336c4666 to master

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

Android.mk

SysUI Tests: Make tests not break SysUI

2014-11-17 14:46:11 -05:00

AndroidManifest.xml

Don't unregister MobileSignalControllers still used

2015-01-05 15:53:00 -05:00