merge heads

2011-11-15 16:43:45 -08:00
parent 999285fcbc
commit ae28dc01fe
99 changed files with 4799 additions and 10962 deletions
@@ -38,7 +38,7 @@ limitations under the License.
    <item name="android:gravity">right</item>
    <item name="android:layout_marginBottom">-9dip</item>
    <item name="android:layout_marginTop">-9dip</item>
-    <item name="android:text">@string/unknown</item>
+    <item name="android:text">@string/value_unknown</item>
    <item name="android:textColor">@color/stat_label_text</item>
    <item name="android:textSize">40sp</item>
  </style>