Merge heads

This commit is contained in:
youtaol
2013-06-08 13:12:39 +08:00
parent 7a09e89041
commit d1055ef5ee
48 changed files with 374 additions and 411 deletions
+2 -1
View File
@@ -75,7 +75,8 @@ limitations under the License.
<!-- export radio group -->
<style name="ExportRadioGroup">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginLeft">16dp</item>
<item name="android:layout_marginBottom">8dp</item>
<item name="android:layout_marginLeft">20dp</item>
<item name="android:layout_width">match_parent</item>
</style>
<!-- help answer -->