Merge fixes from upstream/master

astrid/res/layout-land/date_time_picker.xml

@@ -13,6 +13,11 @@
 		  android:orientation="vertical"
 		  android:layout_width="fill_parent"
 		  android:layout_height="fill_parent">
+		<LinearLayout
+		    android:id="@+id/datetime_extras"
+		    android:layout_width="fill_parent"
+		    android:layout_height="wrap_content"
+		    android:orientation="horizontal"/>
 		  <LinearLayout
 		      android:layout_width="fill_parent"
 		      android:layout_height="wrap_content"

astrid/src/com/todoroo/astrid/service/UpgradeService.java

@@ -41,6 +41,8 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V3_9_2_2 = 209;
+    public static final int V3_9_2_1 = 208;
     public static final int V3_9_2 = 207;
     public static final int V3_9_1_1 = 206;
     public static final int V3_9_1 = 205;
@@ -172,6 +174,13 @@ public final class UpgradeService {
         Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
         StringBuilder changeLog = new StringBuilder();
 
+        if (from >= V3_9_2 && from < V3_9_2_2) {
+            newVersionString(changeLog, "3.9.2.2", new String[] {
+                 "Reduced APK size",
+                 "Fixed bugs with Google Task sync",
+            });
+        }
+
         if (from < V3_9_2) {
             newVersionString(changeLog, "3.9.2 (01/13/12)", new String[] {
                 "Made selecting dates and times easier:",