Joe Onorato 7ebd659dbf Merge commit 'f9f9e248' into manualmerge
Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
	tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java

Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
2010-09-27 14:13:46 -07:00
..
2010-08-03 16:13:54 -07:00