Merge heads

2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
@@ -21,7 +21,7 @@ limitations under the License.
  <TextView
    android:background="@color/warning_background"
    android:drawableLeft="@drawable/warning"
-    android:gravity="center"
+    android:gravity="left|center_vertical"
    android:id="@+id/map_message"
    android:layout_alignParentTop="true"
    android:layout_width="match_parent"