John Spurlock 7534df88fc resolved conflicts for merge of 286291bf to master ...

Change-Id: Ied118f11f0a070b610e4edc4695a07418dcf7ce9

2013-10-25 17:01:46 -04:00

..

media

…

net

…

power

…

recent

…

screenshot

…

settings

…

statusbar

resolved conflicts for merge of 286291bf to master

2013-10-25 17:01:46 -04:00

usb

…

BatteryMeterView.java

Don't show [!] battery at boot.

2013-10-14 10:27:45 -04:00

BootReceiver.java

…

DemoMode.java

…

DessertCase.java

…

DessertCaseDream.java

…

DessertCaseView.java

DessertCase memory improvements

2013-10-24 17:27:33 +00:00

EventLogTags.logtags

…

ExpandHelper.java

…

Gefingerpoken.java

…

ImageWallpaper.java

Fix conditional for glClear call

2013-10-16 13:06:18 -07:00

LoadAverageService.java

…

RecentsComponent.java

…

SearchPanelView.java

…

Somnambulator.java

…

SwipeHelper.java

…

SystemUI.java

…

SystemUIService.java

…