Fix merge conflict for 'c2e1e329'.

Conflicts:
	core/res/res/values/config.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
This commit is contained in:
Dan Morrill 2011-06-13 11:59:38 -07:00
commit 308a3f179e

Diff Content Not Available