tree 5f8fa1f2065458313c114a7b7e1c4b73ad00ebb6
parent 4243a3a6ed571b17668a3caca7a535508893501f
parent 77e42376823197ae7fb3cea2afcca734723174a5
author Joe Onorato <joeo@google.com> 1286296623 -0400
committer Joe Onorato <joeo@google.com> 1286296623 -0400

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