Dan Morrill 74e646cab9 Fix merge conflict for 'c2e1e329'. ...

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

Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99

2011-06-13 11:59:38 -07:00

..

assets

Fix spacing issue

2011-02-10 11:33:35 -08:00

res

Fix merge conflict for 'c2e1e329'.

2011-06-13 11:59:38 -07:00

Android.mk

…

AndroidManifest.xml

resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp

2011-06-07 15:01:50 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…