merge in jb-release history after reset to jb-dev
diff --git a/res/drawable-hdpi/app_web_browser_sm.png b/res/drawable-hdpi/app_web_browser_sm.png
index a3f75cc..62d5cc3 100644
--- a/res/drawable-hdpi/app_web_browser_sm.png
+++ b/res/drawable-hdpi/app_web_browser_sm.png
Binary files differ
diff --git a/res/drawable-mdpi/app_web_browser_sm.png b/res/drawable-mdpi/app_web_browser_sm.png
index 6ac62eb..0bbc682 100644
--- a/res/drawable-mdpi/app_web_browser_sm.png
+++ b/res/drawable-mdpi/app_web_browser_sm.png
Binary files differ
diff --git a/res/drawable-xhdpi/app_web_browser_sm.png b/res/drawable-xhdpi/app_web_browser_sm.png
index 501af7f..45a5f12 100644
--- a/res/drawable-xhdpi/app_web_browser_sm.png
+++ b/res/drawable-xhdpi/app_web_browser_sm.png
Binary files differ
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index 2790362..a9a70fd 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -20,14 +20,14 @@
<com.android.browser.TabScrollView
android:id="@+id/tabs"
android:layout_width="0dip"
- android:layout_height="44dip"
+ android:layout_height="match_parent"
android:layout_weight="1.0"
android:orientation="horizontal" />
<ImageButton
android:id="@+id/newtab"
android:src="@drawable/ic_menu_new_window"
android:layout_width="wrap_content"
- android:layout_height="44dip"
+ android:layout_height="match_parent"
style="@style/HoloButton"
android:background="@drawable/add_tab_selector" />
</merge>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0ae71eb..af221de 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -117,7 +117,7 @@
<string name="contextmenu_view_image" msgid="3870625602053600905">"Lihat gambar"</string>
<string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"Setel sebagai wallpaper"</string>
<string name="contextmenu_dial_dot" msgid="5856550683415933806">"Panggil..."</string>
- <string name="contextmenu_add_contact" msgid="3183511922223645716">"Tambahkan kenalan"</string>
+ <string name="contextmenu_add_contact" msgid="3183511922223645716">"Tambahkan kontak"</string>
<string name="contextmenu_send_mail" msgid="1014513374828775660">"Kirim email"</string>
<string name="contextmenu_map" msgid="7471390435434034912">"Peta"</string>
<string name="choosertitle_sharevia" msgid="4600490613341909086">"Bagikan melalui"</string>
