diff --git a/apps/Fallback/res/values-cs/strings.xml b/apps/Fallback/res/values-cs/strings.xml
index b9d34f9..1fc121c 100644
--- a/apps/Fallback/res/values-cs/strings.xml
+++ b/apps/Fallback/res/values-cs/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Záloha"</string>
-    <string name="title">"Akce není podporována"</string>
-    <string name="error">"Tato akce není momentálně podporována."</string>
+    <string name="appTitle" msgid="161410001913116606">"Záloha"</string>
+    <string name="title" msgid="8156274565006125136">"Akce není podporována"</string>
+    <string name="error" msgid="6539615832923362301">"Tato akce není momentálně podporována."</string>
 </resources>
diff --git a/apps/Fallback/res/values-da/strings.xml b/apps/Fallback/res/values-da/strings.xml
index b3dfa63..4584e61 100644
--- a/apps/Fallback/res/values-da/strings.xml
+++ b/apps/Fallback/res/values-da/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Reserve"</string>
-    <string name="title">"Ikke understøttet handling"</string>
-    <string name="error">"Handlingen er ikke understøttet i øjeblikket."</string>
+    <string name="appTitle" msgid="161410001913116606">"Reserve"</string>
+    <string name="title" msgid="8156274565006125136">"Ikke understøttet handling"</string>
+    <string name="error" msgid="6539615832923362301">"Handlingen er ikke understøttet i øjeblikket."</string>
 </resources>
diff --git a/apps/Fallback/res/values-de/strings.xml b/apps/Fallback/res/values-de/strings.xml
index 8d59ddf..90bbb16 100644
--- a/apps/Fallback/res/values-de/strings.xml
+++ b/apps/Fallback/res/values-de/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"Nicht unterstützte Aktion"</string>
-    <string name="error">"Diese Aktion wird zurzeit nicht unterstützt."</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"Nicht unterstützte Aktion"</string>
+    <string name="error" msgid="6539615832923362301">"Diese Aktion wird zurzeit nicht unterstützt."</string>
 </resources>
diff --git a/apps/Fallback/res/values-el/strings.xml b/apps/Fallback/res/values-el/strings.xml
index fecaf4a..b985af7 100644
--- a/apps/Fallback/res/values-el/strings.xml
+++ b/apps/Fallback/res/values-el/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Εναλλακτική"</string>
-    <string name="title">"Ενέργεια που δεν υποστηρίζεται"</string>
-    <string name="error">"Αυτή η ενέργεια δεν υποστηρίζεται αυτήν τη στιγμή."</string>
+    <string name="appTitle" msgid="161410001913116606">"Εναλλακτική"</string>
+    <string name="title" msgid="8156274565006125136">"Ενέργεια που δεν υποστηρίζεται"</string>
+    <string name="error" msgid="6539615832923362301">"Αυτή η ενέργεια δεν υποστηρίζεται αυτήν τη στιγμή."</string>
 </resources>
diff --git a/apps/Fallback/res/values-es-rUS/strings.xml b/apps/Fallback/res/values-es-rUS/strings.xml
index 0ce5751..d15a287 100644
--- a/apps/Fallback/res/values-es-rUS/strings.xml
+++ b/apps/Fallback/res/values-es-rUS/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"Acción no admitida"</string>
-    <string name="error">"Esa acción no se admite actualmente."</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"Acción no admitida"</string>
+    <string name="error" msgid="6539615832923362301">"Esa acción no se admite actualmente."</string>
 </resources>
diff --git a/apps/Fallback/res/values-es/strings.xml b/apps/Fallback/res/values-es/strings.xml
index 0ce5751..d15a287 100644
--- a/apps/Fallback/res/values-es/strings.xml
+++ b/apps/Fallback/res/values-es/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"Acción no admitida"</string>
-    <string name="error">"Esa acción no se admite actualmente."</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"Acción no admitida"</string>
+    <string name="error" msgid="6539615832923362301">"Esa acción no se admite actualmente."</string>
 </resources>
diff --git a/apps/Fallback/res/values-fr/strings.xml b/apps/Fallback/res/values-fr/strings.xml
index 024ae42..df1e299 100644
--- a/apps/Fallback/res/values-fr/strings.xml
+++ b/apps/Fallback/res/values-fr/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Application de secours"</string>
-    <string name="title">"Action non prise en charge"</string>
-    <string name="error">"Cette action n\'est actuellement pas prise en charge."</string>
+    <string name="appTitle" msgid="161410001913116606">"Application de secours"</string>
+    <string name="title" msgid="8156274565006125136">"Action non prise en charge"</string>
+    <string name="error" msgid="6539615832923362301">"Cette action n\'est actuellement pas prise en charge."</string>
 </resources>
diff --git a/apps/Fallback/res/values-it/strings.xml b/apps/Fallback/res/values-it/strings.xml
index d216e59..2d08c1b 100644
--- a/apps/Fallback/res/values-it/strings.xml
+++ b/apps/Fallback/res/values-it/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"Azione non supportata"</string>
-    <string name="error">"L\'azione non è al momento supportata."</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"Azione non supportata"</string>
+    <string name="error" msgid="6539615832923362301">"L\'azione non è al momento supportata."</string>
 </resources>
diff --git a/apps/Fallback/res/values-ja/strings.xml b/apps/Fallback/res/values-ja/strings.xml
index 79aeb42..f220909 100644
--- a/apps/Fallback/res/values-ja/strings.xml
+++ b/apps/Fallback/res/values-ja/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"サポートされていない操作"</string>
-    <string name="error">"現在サポートされていない操作です。"</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"サポートされていない操作"</string>
+    <string name="error" msgid="6539615832923362301">"現在サポートされていない操作です。"</string>
 </resources>
diff --git a/apps/Fallback/res/values-ko/strings.xml b/apps/Fallback/res/values-ko/strings.xml
index ec1c330..2c2973f 100644
--- a/apps/Fallback/res/values-ko/strings.xml
+++ b/apps/Fallback/res/values-ko/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"폴백"</string>
-    <string name="title">"지원되지 않는 작업"</string>
-    <string name="error">"이 작업은 현재 지원되지 않습니다."</string>
+    <string name="appTitle" msgid="161410001913116606">"폴백"</string>
+    <string name="title" msgid="8156274565006125136">"지원되지 않는 작업"</string>
+    <string name="error" msgid="6539615832923362301">"이 작업은 현재 지원되지 않습니다."</string>
 </resources>
diff --git a/apps/Fallback/res/values-nb/strings.xml b/apps/Fallback/res/values-nb/strings.xml
index 6fed660..02814e6 100644
--- a/apps/Fallback/res/values-nb/strings.xml
+++ b/apps/Fallback/res/values-nb/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"Ustøttet handling"</string>
-    <string name="error">"Denne handlingen er ikke støttet nå."</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"Ustøttet handling"</string>
+    <string name="error" msgid="6539615832923362301">"Denne handlingen er ikke støttet nå."</string>
 </resources>
diff --git a/apps/Fallback/res/values-nl/strings.xml b/apps/Fallback/res/values-nl/strings.xml
index f347964..8989efd 100644
--- a/apps/Fallback/res/values-nl/strings.xml
+++ b/apps/Fallback/res/values-nl/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Reserve"</string>
-    <string name="title">"Niet-ondersteunde actie"</string>
-    <string name="error">"Die actie wordt momenteel niet ondersteund."</string>
+    <string name="appTitle" msgid="161410001913116606">"Reserve"</string>
+    <string name="title" msgid="8156274565006125136">"Niet-ondersteunde actie"</string>
+    <string name="error" msgid="6539615832923362301">"Die actie wordt momenteel niet ondersteund."</string>
 </resources>
diff --git a/apps/Fallback/res/values-pl/strings.xml b/apps/Fallback/res/values-pl/strings.xml
index 73a176a..5740498 100644
--- a/apps/Fallback/res/values-pl/strings.xml
+++ b/apps/Fallback/res/values-pl/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Wycofanie"</string>
-    <string name="title">"Nieobsługiwana czynność"</string>
-    <string name="error">"Ta czynność nie jest aktualnie obsługiwana."</string>
+    <string name="appTitle" msgid="161410001913116606">"Wycofanie"</string>
+    <string name="title" msgid="8156274565006125136">"Nieobsługiwana czynność"</string>
+    <string name="error" msgid="6539615832923362301">"Ta czynność nie jest aktualnie obsługiwana."</string>
 </resources>
diff --git a/apps/Fallback/res/values-pt-rPT/strings.xml b/apps/Fallback/res/values-pt-rPT/strings.xml
index 3c7ec9d..b226ea5 100644
--- a/apps/Fallback/res/values-pt-rPT/strings.xml
+++ b/apps/Fallback/res/values-pt-rPT/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"Acção não suportada"</string>
-    <string name="error">"Esta·acção·ainda·não·é·suportada."</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"Acção não suportada"</string>
+    <string name="error" msgid="6539615832923362301">"Esta acção ainda não é suportada."</string>
 </resources>
diff --git a/apps/Fallback/res/values-pt/strings.xml b/apps/Fallback/res/values-pt/strings.xml
index 08a3faa..395004c 100644
--- a/apps/Fallback/res/values-pt/strings.xml
+++ b/apps/Fallback/res/values-pt/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"Ação não suportada"</string>
-    <string name="error">"Essa ação não é suportada no momento."</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"Ação não suportada"</string>
+    <string name="error" msgid="6539615832923362301">"Essa ação não é suportada no momento."</string>
 </resources>
diff --git a/apps/Fallback/res/values-ru/strings.xml b/apps/Fallback/res/values-ru/strings.xml
index 24c3480..084c3f3 100644
--- a/apps/Fallback/res/values-ru/strings.xml
+++ b/apps/Fallback/res/values-ru/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Переход в обходной режим"</string>
-    <string name="title">"Неподдерживаемое действие"</string>
-    <string name="error">"В настоящее время это действие не поддерживается."</string>
+    <string name="appTitle" msgid="161410001913116606">"Переход в обходной режим"</string>
+    <string name="title" msgid="8156274565006125136">"Неподдерживаемое действие"</string>
+    <string name="error" msgid="6539615832923362301">"В настоящее время это действие не поддерживается."</string>
 </resources>
diff --git a/apps/Fallback/res/values-sv/strings.xml b/apps/Fallback/res/values-sv/strings.xml
index 9dae10d..224d946 100644
--- a/apps/Fallback/res/values-sv/strings.xml
+++ b/apps/Fallback/res/values-sv/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Reserv"</string>
-    <string name="title">"Åtgärden stöds inte"</string>
-    <string name="error">"Den här åtgärden stöds inte för närvarande."</string>
+    <string name="appTitle" msgid="161410001913116606">"Reserv"</string>
+    <string name="title" msgid="8156274565006125136">"Åtgärden stöds inte"</string>
+    <string name="error" msgid="6539615832923362301">"Den här åtgärden stöds inte för närvarande."</string>
 </resources>
diff --git a/apps/Fallback/res/values-tr/strings.xml b/apps/Fallback/res/values-tr/strings.xml
index 27b860a..9c7ed15 100644
--- a/apps/Fallback/res/values-tr/strings.xml
+++ b/apps/Fallback/res/values-tr/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"Fallback"</string>
-    <string name="title">"Desteklenmeyen işlem"</string>
-    <string name="error">"Bu işlem şu an desteklenmiyor."</string>
+    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="title" msgid="8156274565006125136">"Desteklenmeyen işlem"</string>
+    <string name="error" msgid="6539615832923362301">"Bu işlem şu an desteklenmiyor."</string>
 </resources>
diff --git a/apps/Fallback/res/values-zh-rCN/strings.xml b/apps/Fallback/res/values-zh-rCN/strings.xml
index e6cfde1..5b1fbf8 100644
--- a/apps/Fallback/res/values-zh-rCN/strings.xml
+++ b/apps/Fallback/res/values-zh-rCN/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"后备"</string>
-    <string name="title">"不支持此操作"</string>
-    <string name="error">"目前不支持该操作。"</string>
+    <string name="appTitle" msgid="161410001913116606">"后备"</string>
+    <string name="title" msgid="8156274565006125136">"不支持此操作"</string>
+    <string name="error" msgid="6539615832923362301">"目前不支持该操作。"</string>
 </resources>
diff --git a/apps/Fallback/res/values-zh-rTW/strings.xml b/apps/Fallback/res/values-zh-rTW/strings.xml
index 52afdbe..04d7f4f 100644
--- a/apps/Fallback/res/values-zh-rTW/strings.xml
+++ b/apps/Fallback/res/values-zh-rTW/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle">"備用"</string>
-    <string name="title">"不支援的操作"</string>
-    <string name="error">"目前不支援此操作。"</string>
+    <string name="appTitle" msgid="161410001913116606">"備用"</string>
+    <string name="title" msgid="8156274565006125136">"不支援的操作"</string>
+    <string name="error" msgid="6539615832923362301">"目前不支援此操作。"</string>
 </resources>
diff --git a/emulator/skins/HVGA/layout b/emulator/skins/HVGA/layout
index 7117824..cc82dde 100644
--- a/emulator/skins/HVGA/layout
+++ b/emulator/skins/HVGA/layout
@@ -18,7 +18,7 @@
             y       0
         }
     }
-    
+
     controls {
         background {
             image   controls.png
@@ -357,7 +357,7 @@
         height    534
         color     0xe0e0e0
         event     EV_SW:0:1
-        
+
         part1 {
             name    portrait
             x       0
@@ -394,6 +394,12 @@
         color     0xe0e0e0
         event     EV_SW:0:0
 
+        # the framework _always_ assume that the DPad
+        # has been physically rotated in landscape mode.
+        # however, with this skin, this is not the case
+        #
+        dpad-rotation 3
+
         part1 {
             name    portrait
             x       800
diff --git a/emulator/skins/QVGA/layout b/emulator/skins/QVGA/layout
index f98e7bd..96f2133 100644
--- a/emulator/skins/QVGA/layout
+++ b/emulator/skins/QVGA/layout
@@ -393,6 +393,9 @@
         color     0xe0e0e0
         event     EV_SW:0:0
 
+        dpad-rotation 3
+
+
         part1 {
             name    portrait
             x       800
diff --git a/emulator/skins/WQVGA432/layout b/emulator/skins/WQVGA432/layout
index 7e52b53..006e955 100644
--- a/emulator/skins/WQVGA432/layout
+++ b/emulator/skins/WQVGA432/layout
@@ -393,6 +393,8 @@
         color     0xe0e0e0
         event     EV_SW:0:0
 
+        dpad-rotation 3
+
         part1 {
             name    portrait
             x       800
diff --git a/emulator/skins/WVGA800/layout b/emulator/skins/WVGA800/layout
index 6037ab8..63647f3 100644
--- a/emulator/skins/WVGA800/layout
+++ b/emulator/skins/WVGA800/layout
@@ -394,6 +394,8 @@
         color     0xe0e0e0
         event     EV_SW:0:0
 
+        dpad-rotation 3
+
         part1 {
             name    portrait
             x       900
diff --git a/emulator/skins/WVGA854/layout b/emulator/skins/WVGA854/layout
index ab0784d..b086ddc 100644
--- a/emulator/skins/WVGA854/layout
+++ b/emulator/skins/WVGA854/layout
@@ -394,6 +394,8 @@
         color     0xe0e0e0
         event     EV_SW:0:0
 
+        dpad-rotation 3
+
         part1 {
             name    portrait
             x       900
diff --git a/samples/BrowserPlugin/jni/Android.mk b/samples/BrowserPlugin/jni/Android.mk
index b888d54..cbd8a15 100644
--- a/samples/BrowserPlugin/jni/Android.mk
+++ b/samples/BrowserPlugin/jni/Android.mk
@@ -53,12 +53,12 @@
 LOCAL_SHARED_LIBRARIES := \
 	libnativehelper
 
-LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
 LOCAL_CFLAGS += -fvisibility=hidden 
 LOCAL_PRELINK_MODULE:=false
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
 LOCAL_MODULE:= libsampleplugin
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java b/tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
index 6a8213e..81cbc1c 100644
--- a/tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
+++ b/tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
@@ -249,7 +249,7 @@
 
             for (String file : files) {
                 String path = f.getAbsolutePath() + File.separator + file;
-                processJarFile(parameter, resourcesJars);
+                processJarFile(path, resourcesJars);
             }
         } else {
             processJarFile(parameter, resourcesJars);
diff --git a/tools/scripts/android_test_rules.xml b/tools/scripts/android_test_rules.xml
index b7a4078..7bed3a5 100644
--- a/tools/scripts/android_test_rules.xml
+++ b/tools/scripts/android_test_rules.xml
@@ -16,17 +16,19 @@
 
     <macrodef name="run-tests-helper">
         <attribute name="emma.enabled" default="false" />
+        <element name="extra-instrument-args" optional="yes" />
         <sequential>
             <echo>Running tests ...</echo>
             <exec executable="${adb}" failonerror="true">
                 <arg value="shell" />
-                    <arg value="am" />
-                <arg value="instrument" />
-                   <arg value="-w" />
+                <arg value="am" />
+                   <arg value="instrument" />
+                <arg value="-w" />
                 <arg value="-e" />
                    <arg value="coverage" />
-                <arg value="@{emma.enabled}" />
-                   <arg value="${application.package.to.instrument}/${test.runner}" />
+                   <arg value="@{emma.enabled}" />
+                <extra-instrument-args />
+                <arg value="${application.package.to.instrument}/${test.runner}" />
             </exec>
         </sequential>
     </macrodef>
@@ -68,7 +70,13 @@
     <target name="coverage" depends="-set-coverage-classpath, -install-instrumented, install"
                 description="Runs the tests against the instrumented code and generates
                             code coverage report">
-        <run-tests-helper emma.enabled="true" />
+        <run-tests-helper emma.enabled="true">
+            <extra-instrument-args>
+                <arg value="-e" />
+                   <arg value="coverageFile" />
+                   <arg value="${emma.dump.file}" />
+            </extra-instrument-args>
+        </run-tests-helper>
         <echo>Downloading coverage file into project directory...</echo>
         <exec executable="${adb}" failonerror="true">
             <arg value="pull" />