Joe Onorato 066b5c5166 manual merge Merge commit '77e42376' into work
Conflicts:
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
2010-10-05 12:37:03 -04:00
..
2010-08-03 16:13:54 -07:00