diff --git a/apps/Development/AndroidManifest.xml b/apps/Development/AndroidManifest.xml
index 389ac194c..981d5065c 100644
--- a/apps/Development/AndroidManifest.xml
+++ b/apps/Development/AndroidManifest.xml
@@ -176,5 +176,13 @@
             </intent-filter>
         </receiver>
         <service android:name="BadBehaviorActivity$BadService" />
+
+        <activity android:name="ConfigurationViewer" android:label="Configuration">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.TEST" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>
diff --git a/apps/Development/res/layout/configuration_viewer.xml b/apps/Development/res/layout/configuration_viewer.xml
new file mode 100644
index 000000000..6af673923
--- /dev/null
+++ b/apps/Development/res/layout/configuration_viewer.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollHorizontally="true"
+        android:textSize="18sp"
+        />
+
+</ScrollView>
diff --git a/apps/Development/src/com/android/development/ConfigurationViewer.java b/apps/Development/src/com/android/development/ConfigurationViewer.java
new file mode 100644
index 000000000..034f65a0d
--- /dev/null
+++ b/apps/Development/src/com/android/development/ConfigurationViewer.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.development;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.widget.TextView;
+
+public class ConfigurationViewer extends Activity {
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        setContentView(R.layout.configuration_viewer);
+
+        Configuration c = getResources().getConfiguration();
+        DisplayMetrics m = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(m);
+
+        TextView tv = (TextView)findViewById(R.id.text);
+
+        String s = "Configuration\n"
+                + "\n"
+                + "fontScale=" + c.fontScale + "\n"
+                + "hardKeyboardHidden=" + c.hardKeyboardHidden + "\n"
+                + "keyboard=" + c.keyboard + "\n"
+                + "locale=" + c.locale + "\n"
+                + "mcc=" + c.mcc + "\n"
+                + "mnc=" + c.mnc + "\n"
+                + "navigation=" + c.navigation + "\n"
+                + "navigationHidden=" + c.navigationHidden + "\n"
+                + "orientation=" + c.orientation + "\n"
+                + "screenLayout=0x" + Integer.toHexString(c.screenLayout) + "\n"
+                + "touchscreen=" + c.touchscreen + "\n"
+                + "uiMode=0x" + Integer.toHexString(c.uiMode) + "\n"
+                + "\n"
+                + "DisplayMetrics\n"
+                + "\n"
+                + "density=" + m.density + "\n"
+                + "densityDpi=" + m.densityDpi + "\n"
+                + "heightPixels=" + m.heightPixels + "\n"
+                + "scaledDensity=" + m.scaledDensity + "\n"
+                + "widthPixels=" + m.widthPixels + "\n"
+                + "xdpi=" + m.xdpi + "\n"
+                + "ydpi=" + m.ydpi + "\n"
+                ;
+
+        tv.setText(s);
+
+        // Also log it for bugreport purposes.
+        Log.d("ConfigurationViewer", s);
+    }
+}
+