merge heads

This commit is contained in:
Jimmy Shih
2011-12-09 13:53:16 -08:00
parent ca889ee04c
commit 456fa03f8e
82 changed files with 14596 additions and 2620 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ limitations under the License.
<!-- Button -->
<style name="Button">
<item name="android:layout_height">48dip</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dip</item>
<item name="android:maxLines">2</item>