Merge heads

2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
@@ -20,7 +20,7 @@ limitations under the License.
  android:layout_width="match_parent" >
  <TextView
    android:background="@color/warning_background"
-    android:drawableLeft="@drawable/warning"
+    android:drawableLeft="@drawable/ic_warning"
    android:gravity="left|center_vertical"
    android:id="@+id/map_message"
    android:layout_alignParentTop="true"