diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index ed6463af6..c5c4264c1 100644
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -8,6 +8,9 @@
 <ul>
   <li>Fixed a couple of crashes.</li>
   <li>Made items in the History easier to read.</li>
+  <li>New Indonesian and Greek translations.</li>
+  <li>Fixes for Slovakian, Hebrew, and Danish translations.</li>
+  <li>Prevented secure URIs from being added to History or copied to the clipboard.</li>
 </ul>
 <p><b>New in version 3.6:</b></p>
 <ul>
diff --git a/android/default.properties b/android/default.properties
index 4686f7f8d..66db0d159 100644
--- a/android/default.properties
+++ b/android/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-9
+target=android-10
diff --git a/android/src/com/google/zxing/client/android/camera/CameraManager.java b/android/src/com/google/zxing/client/android/camera/CameraManager.java
index 2385836c7..755a14531 100755
--- a/android/src/com/google/zxing/client/android/camera/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -71,6 +71,9 @@ public final class CameraManager {
   private boolean previewing;
   private boolean reverseImage;
   private final boolean useOneShotPreviewCallback;
+  private int requestedFramingRectWidth;
+  private int requestedFramingRectHeight;
+
   /**
    * Preview frames are delivered here, which we pass on to the registered handler. Make sure to
    * clear the handler so it will only receive one message.
@@ -132,6 +135,11 @@ public final class CameraManager {
     if (!initialized) {
       initialized = true;
       configManager.initFromCameraParameters(camera);
+      if (requestedFramingRectWidth > 0 && requestedFramingRectHeight > 0) {
+        setManualFramingRect(requestedFramingRectWidth, requestedFramingRectHeight);
+        requestedFramingRectWidth = 0;
+        requestedFramingRectHeight = 0;
+      }
     }
     configManager.setDesiredCameraParameters(camera);
 
@@ -275,18 +283,23 @@ public final class CameraManager {
    * @param height The height in pixels to scan.
    */
   public void setManualFramingRect(int width, int height) {
-    Point screenResolution = configManager.getScreenResolution();
-    if (width > screenResolution.x) {
-      width = screenResolution.x;
+    if (initialized) {
+      Point screenResolution = configManager.getScreenResolution();
+      if (width > screenResolution.x) {
+        width = screenResolution.x;
+      }
+      if (height > screenResolution.y) {
+        height = screenResolution.y;
+      }
+      int leftOffset = (screenResolution.x - width) / 2;
+      int topOffset = (screenResolution.y - height) / 2;
+      framingRect = new Rect(leftOffset, topOffset, leftOffset + width, topOffset + height);
+      Log.d(TAG, "Calculated manual framing rect: " + framingRect);
+      framingRectInPreview = null;
+    } else {
+      requestedFramingRectWidth = width;
+      requestedFramingRectHeight = height;
     }
-    if (height > screenResolution.y) {
-      height = screenResolution.y;
-    }
-    int leftOffset = (screenResolution.x - width) / 2;
-    int topOffset = (screenResolution.y - height) / 2;
-    framingRect = new Rect(leftOffset, topOffset, leftOffset + width, topOffset + height);
-    Log.d(TAG, "Calculated manual framing rect: " + framingRect);
-    framingRectInPreview = null;
   }
 
   /**
diff --git a/androidtest/AndroidManifest.xml b/androidtest/AndroidManifest.xml
index 1a5175acf..878612f67 100755
--- a/androidtest/AndroidManifest.xml
+++ b/androidtest/AndroidManifest.xml
@@ -18,14 +18,16 @@
           package="com.google.zxing.client.androidtest"
           android:versionName="1.12"
           android:versionCode="4">
-  <!-- We require Cupcake (Android 1.5) or later. -->
-  <uses-sdk android:minSdkVersion="3"/>
-  <!-- Donut-specific flags which allow us to run on large and high dpi screens. -->
-  <supports-screens
-      android:largeScreens="true"
-      android:normalScreens="true"
-      android:smallScreens="true"
-      android:anyDensity="true"/>
+  <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
+  <uses-sdk android:minSdkVersion="3"
+            android:targetSdkVersion="4"/>
+  <!-- Donut-specific flags which allow us to run on any dpi screens. -->
+  <supports-screens android:xlargeScreens="true"
+                    android:largeScreens="true"
+                    android:normalScreens="true"
+                    android:smallScreens="true"
+                    android:anyDensity="true"/>
+  <uses-feature android:name="android.hardware.camera"/>
   <application android:label="@string/app_name"
                android:icon="@drawable/icon"
                android:debuggable="true">
diff --git a/androidtest/default.properties b/androidtest/default.properties
index 8bf352136..66db0d159 100644
--- a/androidtest/default.properties
+++ b/androidtest/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:4
+target=android-10
diff --git a/build.properties b/build.properties
index 130cabb10..71471403f 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 version=1.6
 
 # Set to the location where ProGuard's proguard.jar file can be found
-#proguard-jar=
+proguard-jar=/Users/dswitkin/Source/android-sdk/tools/proguard/lib/proguard.jar
 
 # If you are building the J2ME client:
 #
@@ -28,7 +28,7 @@ version=1.6
 
 # Set this to the location where you installed the Android SDK.
 #android-home=C:\\Program Files\\android-sdk-windows
-#android-home=/usr/local/android
+android-home=/Users/dswitkin/Source/android-sdk
 
 # Set this to the location of a Tomcat installation if you want to compile and run the zxing.org
 # web site and web application