Merge heads

2012-06-20 09:45:23 +08:00
parent f1a3c5dffa
commit 978b6c5a09
123 changed files with 2475 additions and 5323 deletions
@@ -40,6 +40,7 @@ limitations under the License.
  </style>
  <!-- The style for choose upload service image view -->
  <style name="ChooseUploadServiceImageView">
+    <item name="android:layout_gravity">center</item>
    <item name="android:layout_height">wrap_content</item>
    <item name="android:layout_width">wrap_content</item>
  </style>