Fix merge conflict for 'c2e1e329'.

Browse Source

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

parent ff66c00bc6 5e76bf9037

commit 308a3f179e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available