Merge "Remove accidentally exposed Geofencing classes."
diff --git a/api/26.txt b/api/26.txt
index 3e517d2..4fb216a 100644
--- a/api/26.txt
+++ b/api/26.txt
@@ -11952,12 +11952,6 @@
     enum_constant public static final android.graphics.Interpolator.Result NORMAL;
   }
 
-  public deprecated class LayerRasterizer extends android.graphics.Rasterizer {
-    ctor public LayerRasterizer();
-    method public void addLayer(android.graphics.Paint, float, float);
-    method public void addLayer(android.graphics.Paint);
-  }
-
   public class LightingColorFilter extends android.graphics.ColorFilter {
     ctor public LightingColorFilter(int, int);
   }
@@ -12119,7 +12113,6 @@
     method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float);
     method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float);
     method public android.graphics.PathEffect getPathEffect();
-    method public deprecated android.graphics.Rasterizer getRasterizer();
     method public float getRunAdvance(char[], int, int, int, int, boolean, int);
     method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int);
     method public android.graphics.Shader getShader();
@@ -12176,7 +12169,6 @@
     method public void setLinearText(boolean);
     method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter);
     method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect);
-    method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer);
     method public android.graphics.Shader setShader(android.graphics.Shader);
     method public void setShadowLayer(float, float, float, int);
     method public void setStrikeThruText(boolean);
@@ -12482,10 +12474,6 @@
     ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
   }
 
-  public deprecated class Rasterizer {
-    ctor public Rasterizer();
-  }
-
   public final class Rect implements android.os.Parcelable {
     ctor public Rect();
     ctor public Rect(int, int, int, int);
@@ -39389,12 +39377,6 @@
     method public void writeToParcel(android.os.Parcel, int);
   }
 
-  public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
-    ctor public RasterizerSpan(android.graphics.Rasterizer);
-    method public android.graphics.Rasterizer getRasterizer();
-    method public void updateDrawState(android.text.TextPaint);
-  }
-
   public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
     ctor public RelativeSizeSpan(float);
     ctor public RelativeSizeSpan(android.os.Parcel);
diff --git a/current/android.jar b/current/android.jar
index 783e754..a6f93c3 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/framework.aidl b/current/framework.aidl
index bdfd6d4..0d7c042 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -20,9 +20,9 @@
 parcelable android.media.tv.TvTrackInfo;
 parcelable android.media.browse.MediaBrowser.MediaItem;
 parcelable android.net.wifi.ScanSettings;
-parcelable android.net.wifi.nan.ConfigRequest;
-parcelable android.net.wifi.nan.PublishConfig;
-parcelable android.net.wifi.nan.SubscribeConfig;
+parcelable android.net.wifi.aware.ConfigRequest;
+parcelable android.net.wifi.aware.PublishConfig;
+parcelable android.net.wifi.aware.SubscribeConfig;
 parcelable android.net.wifi.p2p.WifiP2pInfo;
 parcelable android.net.wifi.p2p.WifiP2pDeviceList;
 parcelable android.net.wifi.p2p.WifiP2pConfig;
@@ -45,7 +45,11 @@
 parcelable android.graphics.drawable.Icon;
 parcelable android.accounts.AuthenticatorDescription;
 parcelable android.accounts.Account;
+parcelable android.app.admin.ConnectEvent;
+parcelable android.app.admin.DnsEvent;
+parcelable android.app.admin.NetworkEvent;
 parcelable android.app.admin.SystemUpdatePolicy;
+parcelable android.app.admin.PasswordMetrics;
 parcelable android.print.PrintDocumentInfo;
 parcelable android.print.PageRange;
 parcelable android.print.PrintAttributes;
@@ -69,6 +73,8 @@
 parcelable android.os.WorkSource;
 parcelable android.os.DropBoxManager.Entry;
 parcelable android.os.Bundle;
+parcelable android.os.Debug.MemoryInfo;
+parcelable android.os.StrictMode.ViolationInfo;
 parcelable android.accessibilityservice.AccessibilityServiceInfo;
 parcelable android.net.Network;
 parcelable android.net.RouteInfo;
@@ -121,7 +127,15 @@
 parcelable android.app.WallpaperInfo;
 parcelable android.app.AppOpsManager.PackageOps;
 parcelable android.app.AppOpsManager.OpEntry;
+parcelable android.app.ActivityManager.MemoryInfo;
+parcelable android.app.ActivityManager.ProcessErrorStateInfo;
 parcelable android.app.ActivityManager.RecentTaskInfo;
+parcelable android.app.ActivityManager.TaskDescription;
+parcelable android.app.ActivityManager.RunningAppProcessInfo;
+parcelable android.app.ActivityManager.RunningServiceInfo;
+parcelable android.app.ActivityManager.RunningTaskInfo;
+parcelable android.app.ActivityManager.StackInfo;
+parcelable android.app.ActivityManager.TaskThumbnail;
 parcelable android.app.PendingIntent;
 parcelable android.app.AlarmManager.AlarmClockInfo;
 parcelable android.app.SearchableInfo;
@@ -152,6 +166,7 @@
 parcelable android.content.pm.ApplicationInfo;
 parcelable android.content.pm.PermissionInfo;
 parcelable android.content.pm.ActivityInfo;
+parcelable android.content.pm.ConfigurationInfo;
 parcelable android.content.pm.PackageInfo;
 parcelable android.content.pm.ResolveInfo;
 parcelable android.content.pm.ProviderInfo;
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index 4f80405..2f4bc01 100644
--- a/current/support/annotations/android-support-annotations.jar
+++ b/current/support/annotations/android-support-annotations.jar
Binary files differ
diff --git a/current/support/compat/src/tests/res/drawable/test_drawable_blue.xml b/current/support/compat/src/tests/res/drawable/test_drawable_blue.xml
index 5d05ef2..eae0ecb 100644
--- a/current/support/compat/src/tests/res/drawable/test_drawable_blue.xml
+++ b/current/support/compat/src/tests/res/drawable/test_drawable_blue.xml
@@ -22,4 +22,4 @@
         android:height="@dimen/drawable_small_size" />
     <solid
         android:color="@color/test_blue" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/compat/src/tests/res/drawable/test_drawable_green.xml b/current/support/compat/src/tests/res/drawable/test_drawable_green.xml
index 9f33104..0de8213 100644
--- a/current/support/compat/src/tests/res/drawable/test_drawable_green.xml
+++ b/current/support/compat/src/tests/res/drawable/test_drawable_green.xml
@@ -22,4 +22,4 @@
         android:height="@dimen/drawable_large_size" />
     <solid
         android:color="@color/test_green" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/compat/src/tests/res/drawable/test_drawable_red.xml b/current/support/compat/src/tests/res/drawable/test_drawable_red.xml
index cd1af56..e630659 100644
--- a/current/support/compat/src/tests/res/drawable/test_drawable_red.xml
+++ b/current/support/compat/src/tests/res/drawable/test_drawable_red.xml
@@ -22,4 +22,4 @@
         android:height="@dimen/drawable_medium_size" />
     <solid
         android:color="@color/test_red" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/compat/src/tests/res/drawable/themed_drawable.xml b/current/support/compat/src/tests/res/drawable/themed_drawable.xml
index 08d89c7..a460465 100644
--- a/current/support/compat/src/tests/res/drawable/themed_drawable.xml
+++ b/current/support/compat/src/tests/res/drawable/themed_drawable.xml
@@ -22,4 +22,4 @@
         android:height="@dimen/drawable_small_size" />
     <solid
         android:color="?attr/theme_color_default" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/compat/src/tests/res/values-hdpi/dimens.xml b/current/support/compat/src/tests/res/values-hdpi/dimens.xml
index eb1ff54..3e7770a 100644
--- a/current/support/compat/src/tests/res/values-hdpi/dimens.xml
+++ b/current/support/compat/src/tests/res/values-hdpi/dimens.xml
@@ -15,4 +15,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <dimen name="density_aware_size">14dip</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/compat/src/tests/res/values-mdpi/dimens.xml b/current/support/compat/src/tests/res/values-mdpi/dimens.xml
index 5766379..5b5a669 100644
--- a/current/support/compat/src/tests/res/values-mdpi/dimens.xml
+++ b/current/support/compat/src/tests/res/values-mdpi/dimens.xml
@@ -15,4 +15,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <dimen name="density_aware_size">12dip</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/compat/src/tests/res/values-xhdpi/dimens.xml b/current/support/compat/src/tests/res/values-xhdpi/dimens.xml
index a25d23d..43a623e 100644
--- a/current/support/compat/src/tests/res/values-xhdpi/dimens.xml
+++ b/current/support/compat/src/tests/res/values-xhdpi/dimens.xml
@@ -15,4 +15,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <dimen name="density_aware_size">16dip</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/compat/src/tests/res/values-xxhdpi/dimens.xml b/current/support/compat/src/tests/res/values-xxhdpi/dimens.xml
index 399cde1..77c5bbb 100644
--- a/current/support/compat/src/tests/res/values-xxhdpi/dimens.xml
+++ b/current/support/compat/src/tests/res/values-xxhdpi/dimens.xml
@@ -15,4 +15,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <dimen name="density_aware_size">18dip</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/compat/src/tests/res/values/attrs.xml b/current/support/compat/src/tests/res/values/attrs.xml
index 36d1e9e..3d68176 100644
--- a/current/support/compat/src/tests/res/values/attrs.xml
+++ b/current/support/compat/src/tests/res/values/attrs.xml
@@ -18,4 +18,4 @@
     <attr name="theme_color_focused" format="reference" />
     <attr name="theme_color_pressed" format="reference" />
     <attr name="theme_color_selected" format="reference" />
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/compat/src/tests/res/values/dimens.xml b/current/support/compat/src/tests/res/values/dimens.xml
index 5c82462..5d0592a 100644
--- a/current/support/compat/src/tests/res/values/dimens.xml
+++ b/current/support/compat/src/tests/res/values/dimens.xml
@@ -19,4 +19,4 @@
     <dimen name="drawable_small_size">12dip</dimen>
     <dimen name="drawable_medium_size">16dip</dimen>
     <dimen name="drawable_large_size">20dip</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/compat/src/tests/res/values/strings.xml b/current/support/compat/src/tests/res/values/strings.xml
index 4aebfae..478e8c0 100644
--- a/current/support/compat/src/tests/res/values/strings.xml
+++ b/current/support/compat/src/tests/res/values/strings.xml
@@ -20,4 +20,4 @@
     <string name="test_text_medium">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam dui neque, suscipit quis rhoncus vitae, rhoncus hendrerit neque.</string>
     <!-- Long text for testing. -->
     <string name="test_text_long">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam dui neque, suscipit quis rhoncus vitae, rhoncus hendrerit neque. Proin ac mauris cursus nulla aliquam viverra. Vivamus pharetra luctus magna, lacinia imperdiet leo mollis eget. Fusce a diam ipsum. Etiam sit amet nisl et velit aliquam dignissim eget nec nisi. Duis bibendum euismod tortor non pulvinar. Nunc quis neque ultricies nulla luctus aliquet. Sed consectetur, orci ac vehicula consectetur, metus sem pellentesque turpis, sed venenatis nisi lorem vitae ante.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/compat/src/tests/res/values/styles.xml b/current/support/compat/src/tests/res/values/styles.xml
index 447d5ec..0185a15 100644
--- a/current/support/compat/src/tests/res/values/styles.xml
+++ b/current/support/compat/src/tests/res/values/styles.xml
@@ -34,4 +34,4 @@
         <item name="theme_color_focused">@color/theme_color_lilac_focused</item>
         <item name="theme_color_pressed">@color/theme_color_lilac_pressed</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/core-ui/src/tests/res/layout/swipe_refresh_layout_activity.xml b/current/support/core-ui/src/tests/res/layout/swipe_refresh_layout_activity.xml
index d925ecf..731836e 100644
--- a/current/support/core-ui/src/tests/res/layout/swipe_refresh_layout_activity.xml
+++ b/current/support/core-ui/src/tests/res/layout/swipe_refresh_layout_activity.xml
@@ -24,4 +24,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/content"/>
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/current/support/core-ui/src/tests/res/layout/swipe_refresh_layout_disabled_activity.xml b/current/support/core-ui/src/tests/res/layout/swipe_refresh_layout_disabled_activity.xml
index fe5b364..22a6612 100644
--- a/current/support/core-ui/src/tests/res/layout/swipe_refresh_layout_disabled_activity.xml
+++ b/current/support/core-ui/src/tests/res/layout/swipe_refresh_layout_disabled_activity.xml
@@ -25,4 +25,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/content"/>
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/current/support/core-ui/src/tests/res/values/dimens.xml b/current/support/core-ui/src/tests/res/values/dimens.xml
index c3617a9..46ca94d 100644
--- a/current/support/core-ui/src/tests/res/values/dimens.xml
+++ b/current/support/core-ui/src/tests/res/values/dimens.xml
@@ -15,4 +15,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <dimen name="text_medium_size">20sp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/core-ui/src/tests/res/values/ids.xml b/current/support/core-ui/src/tests/res/values/ids.xml
index e5fcf63..2147fef 100644
--- a/current/support/core-ui/src/tests/res/values/ids.xml
+++ b/current/support/core-ui/src/tests/res/values/ids.xml
@@ -24,4 +24,4 @@
     <item name="page_7" type="id"/>
     <item name="page_8" type="id"/>
     <item name="page_9" type="id"/>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/core-ui/src/tests/res/values/strings.xml b/current/support/core-ui/src/tests/res/values/strings.xml
index 2fa1430..7a48016 100644
--- a/current/support/core-ui/src/tests/res/values/strings.xml
+++ b/current/support/core-ui/src/tests/res/values/strings.xml
@@ -15,4 +15,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="hello">Hello World</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/core-ui/src/tests/res/values/styles.xml b/current/support/core-ui/src/tests/res/values/styles.xml
index ae6325b..d030a00 100644
--- a/current/support/core-ui/src/tests/res/values/styles.xml
+++ b/current/support/core-ui/src/tests/res/values/styles.xml
@@ -22,4 +22,4 @@
         <item name="android:textColor">@color/text_color</item>
         <item name="android:textStyle">italic</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/customtabs/libs/android-support-customtabs.jar b/current/support/customtabs/libs/android-support-customtabs.jar
index 03eaed2..f2915ea 100644
--- a/current/support/customtabs/libs/android-support-customtabs.jar
+++ b/current/support/customtabs/libs/android-support-customtabs.jar
Binary files differ
diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index d7c8f0a..15f4e24 100644
--- a/current/support/design/libs/android-support-design.jar
+++ b/current/support/design/libs/android-support-design.jar
Binary files differ
diff --git a/current/support/design/res/anim/design_snackbar_out.xml b/current/support/design/res/anim/design_snackbar_out.xml
index eb55cc0..b535c04 100644
--- a/current/support/design/res/anim/design_snackbar_out.xml
+++ b/current/support/design/res/anim/design_snackbar_out.xml
@@ -17,4 +17,4 @@
 
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
            android:fromYDelta="0"
-           android:toYDelta="100%"/>
\ No newline at end of file
+           android:toYDelta="100%"/>
diff --git a/current/support/design/res/anim-v21/design_appbar_state_list_animator.xml b/current/support/design/res/animator-v21/design_appbar_state_list_animator.xml
similarity index 99%
rename from current/support/design/res/anim-v21/design_appbar_state_list_animator.xml
rename to current/support/design/res/animator-v21/design_appbar_state_list_animator.xml
index a8a98e5..12d82ea 100644
--- a/current/support/design/res/anim-v21/design_appbar_state_list_animator.xml
+++ b/current/support/design/res/animator-v21/design_appbar_state_list_animator.xml
@@ -37,4 +37,4 @@
                         android:valueType="floatType"/>
     </item>
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/design/res/color-v23/design_tint_password_toggle.xml b/current/support/design/res/color-v23/design_tint_password_toggle.xml
index 3a09d32..fb124f8 100644
--- a/current/support/design/res/color-v23/design_tint_password_toggle.xml
+++ b/current/support/design/res/color-v23/design_tint_password_toggle.xml
@@ -15,6 +15,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="?android:attr/colorForeground" android:alpha="0.54"/>
-    <item android:color="?android:attr/colorForeground" android:alpha="0.38"/>
-</selector>
\ No newline at end of file
+    <item android:color="?android:attr/colorForeground" android:alpha="0.54"/>
+</selector>
diff --git a/current/support/design/res/color/design_error.xml b/current/support/design/res/color/design_error.xml
index e28602f..45f2235 100644
--- a/current/support/design/res/color/design_error.xml
+++ b/current/support/design/res/color/design_error.xml
@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?android:attr/textColorTertiary"/>
     <item android:color="?attr/textColorError"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/design/res/color/design_tint_password_toggle.xml b/current/support/design/res/color/design_tint_password_toggle.xml
index 15016e4..3bbc02c 100644
--- a/current/support/design/res/color/design_tint_password_toggle.xml
+++ b/current/support/design/res/color/design_tint_password_toggle.xml
@@ -16,6 +16,5 @@
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:state_checked="true" android:color="?android:attr/colorForeground" app:alpha="0.54"/>
-    <item android:color="?android:attr/colorForeground" app:alpha="0.38"/>
-</selector>
\ No newline at end of file
+    <item android:color="?android:attr/colorForeground" app:alpha="0.54"/>
+</selector>
diff --git a/current/support/design/res/drawable/design_ic_visibility.xml b/current/support/design/res/drawable-anydpi-v21/design_ic_visibility.xml
similarity index 74%
rename from current/support/design/res/drawable/design_ic_visibility.xml
rename to current/support/design/res/drawable-anydpi-v21/design_ic_visibility.xml
index 91d46ff..923d93b 100644
--- a/current/support/design/res/drawable/design_ic_visibility.xml
+++ b/current/support/design/res/drawable-anydpi-v21/design_ic_visibility.xml
@@ -20,7 +20,9 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
+
     <path
-        android:fillColor="@android:color/black"
-        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
-</vector>
\ No newline at end of file
+        android:fillColor="@android:color/white"
+        android:pathData="@string/path_password_eye"/>
+
+</vector>
diff --git a/current/support/design/res/drawable-anydpi-v21/design_ic_visibility_off.xml b/current/support/design/res/drawable-anydpi-v21/design_ic_visibility_off.xml
new file mode 100644
index 0000000..2dd6b53
--- /dev/null
+++ b/current/support/design/res/drawable-anydpi-v21/design_ic_visibility_off.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+
+</vector>
diff --git a/current/support/design/res/drawable-hdpi/design_ic_visibility.png b/current/support/design/res/drawable-hdpi/design_ic_visibility.png
new file mode 100644
index 0000000..329e617
--- /dev/null
+++ b/current/support/design/res/drawable-hdpi/design_ic_visibility.png
Binary files differ
diff --git a/current/support/design/res/drawable-hdpi/design_ic_visibility_off.png b/current/support/design/res/drawable-hdpi/design_ic_visibility_off.png
new file mode 100644
index 0000000..b21a686
--- /dev/null
+++ b/current/support/design/res/drawable-hdpi/design_ic_visibility_off.png
Binary files differ
diff --git a/current/support/design/res/drawable-mdpi/design_ic_visibility.png b/current/support/design/res/drawable-mdpi/design_ic_visibility.png
new file mode 100644
index 0000000..58597e9
--- /dev/null
+++ b/current/support/design/res/drawable-mdpi/design_ic_visibility.png
Binary files differ
diff --git a/current/support/design/res/drawable-mdpi/design_ic_visibility_off.png b/current/support/design/res/drawable-mdpi/design_ic_visibility_off.png
new file mode 100644
index 0000000..3efdf49
--- /dev/null
+++ b/current/support/design/res/drawable-mdpi/design_ic_visibility_off.png
Binary files differ
diff --git a/current/support/design/res/drawable-v21/avd_hide_password.xml b/current/support/design/res/drawable-v21/avd_hide_password.xml
new file mode 100644
index 0000000..8c6ed1c
--- /dev/null
+++ b/current/support/design/res/drawable-v21/avd_hide_password.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+
+    <aapt:attr name="android:drawable">
+
+        <vector
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportHeight="24"
+            android:viewportWidth="24">
+
+            <path
+                android:name="strike_through"
+                android:pathData="@string/path_password_strike_through"
+                android:strokeColor="@android:color/white"
+                android:strokeLineCap="square"
+                android:strokeWidth="1.8"
+                android:trimPathEnd="0"/>
+
+            <group>
+
+                <clip-path
+                    android:name="eye_mask"
+                    android:pathData="@string/path_password_eye_mask_visible"/>
+
+                <path
+                    android:name="eye"
+                    android:fillColor="@android:color/white"
+                    android:pathData="@string/path_password_eye"/>
+
+            </group>
+
+        </vector>
+
+    </aapt:attr>
+
+    <target android:name="eye_mask">
+
+        <aapt:attr name="android:animation">
+
+            <objectAnimator
+                android:duration="@integer/hide_password_duration"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:propertyName="pathData"
+                android:valueFrom="@string/path_password_eye_mask_visible"
+                android:valueTo="@string/path_password_eye_mask_strike_through"
+                android:valueType="pathType"/>
+
+        </aapt:attr>
+
+    </target>
+
+    <target android:name="strike_through">
+
+        <aapt:attr name="android:animation">
+
+            <objectAnimator
+                android:duration="@integer/hide_password_duration"
+                android:interpolator="@android:interpolator/fast_out_slow_in"
+                android:propertyName="trimPathEnd"
+                android:valueFrom="0"
+                android:valueTo="1"/>
+
+        </aapt:attr>
+
+    </target>
+
+</animated-vector>
diff --git a/current/support/design/res/drawable-v21/avd_show_password.xml b/current/support/design/res/drawable-v21/avd_show_password.xml
new file mode 100644
index 0000000..5b205d7
--- /dev/null
+++ b/current/support/design/res/drawable-v21/avd_show_password.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+
+    <aapt:attr name="android:drawable">
+
+        <vector
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportHeight="24"
+            android:viewportWidth="24">
+
+            <path
+                android:name="strike_through"
+                android:pathData="@string/path_password_strike_through"
+                android:strokeColor="@android:color/white"
+                android:strokeLineCap="square"
+                android:strokeWidth="1.8"/>
+
+            <group>
+
+                <clip-path
+                    android:name="eye_mask"
+                    android:pathData="@string/path_password_eye_mask_strike_through"/>
+
+                <path
+                    android:name="eye"
+                    android:fillColor="@android:color/white"
+                    android:pathData="@string/path_password_eye"/>
+
+            </group>
+
+        </vector>
+
+    </aapt:attr>
+
+    <target android:name="eye_mask">
+
+        <aapt:attr name="android:animation">
+
+            <objectAnimator
+                android:duration="@integer/show_password_duration"
+                android:interpolator="@android:interpolator/fast_out_linear_in"
+                android:propertyName="pathData"
+                android:valueFrom="@string/path_password_eye_mask_strike_through"
+                android:valueTo="@string/path_password_eye_mask_visible"
+                android:valueType="pathType"/>
+
+        </aapt:attr>
+
+    </target>
+
+    <target android:name="strike_through">
+
+        <aapt:attr name="android:animation">
+
+            <objectAnimator
+                android:duration="@integer/show_password_duration"
+                android:interpolator="@android:interpolator/fast_out_linear_in"
+                android:propertyName="trimPathEnd"
+                android:valueFrom="1"
+                android:valueTo="0"/>
+
+        </aapt:attr>
+
+    </target>
+
+</animated-vector>
diff --git a/current/support/design/res/drawable-v21/design_bottom_navigation_item_background.xml b/current/support/design/res/drawable-v21/design_bottom_navigation_item_background.xml
index f30f08b..76ab41c 100644
--- a/current/support/design/res/drawable-v21/design_bottom_navigation_item_background.xml
+++ b/current/support/design/res/drawable-v21/design_bottom_navigation_item_background.xml
@@ -16,4 +16,4 @@
   -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?attr/colorPrimary" />
\ No newline at end of file
+        android:color="?attr/colorPrimary" />
diff --git a/current/support/design/res/drawable-v21/design_password_eye.xml b/current/support/design/res/drawable-v21/design_password_eye.xml
new file mode 100644
index 0000000..5dfbc90
--- /dev/null
+++ b/current/support/design/res/drawable-v21/design_password_eye.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/visible"
+        android:drawable="@drawable/design_ic_visibility"
+        android:state_checked="true"/>
+
+    <item
+        android:id="@+id/masked"
+        android:drawable="@drawable/design_ic_visibility_off"/>
+
+    <transition
+        android:drawable="@drawable/avd_show_password"
+        android:fromId="@id/masked"
+        android:toId="@id/visible"/>
+
+    <transition
+        android:drawable="@drawable/avd_hide_password"
+        android:fromId="@id/visible"
+        android:toId="@id/masked"/>
+
+</animated-selector>
diff --git a/current/support/design/res/drawable-xhdpi/design_ic_visibility.png b/current/support/design/res/drawable-xhdpi/design_ic_visibility.png
new file mode 100644
index 0000000..1f7b4cc
--- /dev/null
+++ b/current/support/design/res/drawable-xhdpi/design_ic_visibility.png
Binary files differ
diff --git a/current/support/design/res/drawable-xhdpi/design_ic_visibility_off.png b/current/support/design/res/drawable-xhdpi/design_ic_visibility_off.png
new file mode 100644
index 0000000..46bf0c9
--- /dev/null
+++ b/current/support/design/res/drawable-xhdpi/design_ic_visibility_off.png
Binary files differ
diff --git a/current/support/design/res/drawable-xxhdpi/design_ic_visibility.png b/current/support/design/res/drawable-xxhdpi/design_ic_visibility.png
new file mode 100644
index 0000000..c816ab4
--- /dev/null
+++ b/current/support/design/res/drawable-xxhdpi/design_ic_visibility.png
Binary files differ
diff --git a/current/support/design/res/drawable-xxhdpi/design_ic_visibility_off.png b/current/support/design/res/drawable-xxhdpi/design_ic_visibility_off.png
new file mode 100644
index 0000000..13eb65d
--- /dev/null
+++ b/current/support/design/res/drawable-xxhdpi/design_ic_visibility_off.png
Binary files differ
diff --git a/current/support/design/res/drawable-xxxhdpi/design_ic_visibility.png b/current/support/design/res/drawable-xxxhdpi/design_ic_visibility.png
new file mode 100644
index 0000000..e005b97
--- /dev/null
+++ b/current/support/design/res/drawable-xxxhdpi/design_ic_visibility.png
Binary files differ
diff --git a/current/support/design/res/drawable-xxxhdpi/design_ic_visibility_off.png b/current/support/design/res/drawable-xxxhdpi/design_ic_visibility_off.png
new file mode 100644
index 0000000..ce3c9d8
--- /dev/null
+++ b/current/support/design/res/drawable-xxxhdpi/design_ic_visibility_off.png
Binary files differ
diff --git a/current/support/design/res/drawable/design_bottom_navigation_item_background.xml b/current/support/design/res/drawable/design_bottom_navigation_item_background.xml
index 7674f42..f54b141 100644
--- a/current/support/design/res/drawable/design_bottom_navigation_item_background.xml
+++ b/current/support/design/res/drawable/design_bottom_navigation_item_background.xml
@@ -26,4 +26,4 @@
             <solid android:color="#ffffff"/>
         </shape>
     </item>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/design/res/drawable/design_fab_background.xml b/current/support/design/res/drawable/design_fab_background.xml
index 43afd5c..03d82f1 100644
--- a/current/support/design/res/drawable/design_fab_background.xml
+++ b/current/support/design/res/drawable/design_fab_background.xml
@@ -18,4 +18,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
         android:shape="oval">
     <solid android:color="@android:color/white" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/design/res/drawable/design_password_eye.xml b/current/support/design/res/drawable/design_password_eye.xml
new file mode 100644
index 0000000..11eb16d
--- /dev/null
+++ b/current/support/design/res/drawable/design_password_eye.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:drawable="@drawable/design_ic_visibility"
+        android:state_checked="true"/>
+
+    <item
+        android:drawable="@drawable/design_ic_visibility_off"/>
+
+</selector>
diff --git a/current/support/design/res/drawable/design_snackbar_background.xml b/current/support/design/res/drawable/design_snackbar_background.xml
index e82441c..6d9a519 100644
--- a/current/support/design/res/drawable/design_snackbar_background.xml
+++ b/current/support/design/res/drawable/design_snackbar_background.xml
@@ -19,4 +19,4 @@
        android:shape="rectangle">
     <corners android:radius="@dimen/design_snackbar_background_corner_radius"/>
     <solid android:color="@color/design_snackbar_background_color"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/design/res/layout-sw600dp/design_layout_snackbar.xml b/current/support/design/res/layout-sw600dp/design_layout_snackbar.xml
index 28835e5..ef01577 100644
--- a/current/support/design/res/layout-sw600dp/design_layout_snackbar.xml
+++ b/current/support/design/res/layout-sw600dp/design_layout_snackbar.xml
@@ -21,4 +21,4 @@
       android:layout_height="wrap_content"
       android:layout_gravity="bottom|center_horizontal"
       android:theme="@style/ThemeOverlay.AppCompat.Dark"
-      style="@style/Widget.Design.Snackbar" />
\ No newline at end of file
+      style="@style/Widget.Design.Snackbar" />
diff --git a/current/support/design/res/layout/design_bottom_navigation_item.xml b/current/support/design/res/layout/design_bottom_navigation_item.xml
index cc7bb5f..7c72d6a 100644
--- a/current/support/design/res/layout/design_bottom_navigation_item.xml
+++ b/current/support/design/res/layout/design_bottom_navigation_item.xml
@@ -34,6 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="@dimen/design_bottom_navigation_text_size"
+            android:singleLine="true"
             android:duplicateParentState="true" />
         <TextView
             android:id="@+id/largeLabel"
@@ -41,6 +42,7 @@
             android:layout_height="wrap_content"
             android:visibility="invisible"
             android:textSize="@dimen/design_bottom_navigation_active_text_size"
+            android:singleLine="true"
             android:duplicateParentState="true" />
     </android.support.design.internal.BaselineLayout>
-</merge>
\ No newline at end of file
+</merge>
diff --git a/current/support/design/res/layout/design_bottom_sheet_dialog.xml b/current/support/design/res/layout/design_bottom_sheet_dialog.xml
index c99caa6..f4edb66 100644
--- a/current/support/design/res/layout/design_bottom_sheet_dialog.xml
+++ b/current/support/design/res/layout/design_bottom_sheet_dialog.xml
@@ -32,7 +32,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal|top"
-            android:clickable="true"
             app:layout_behavior="@string/bottom_sheet_behavior"
             style="?attr/bottomSheetStyle"/>
 
diff --git a/current/support/design/res/layout/design_layout_snackbar.xml b/current/support/design/res/layout/design_layout_snackbar.xml
index 8f3f0d6..da09d0c 100644
--- a/current/support/design/res/layout/design_layout_snackbar.xml
+++ b/current/support/design/res/layout/design_layout_snackbar.xml
@@ -21,4 +21,4 @@
       android:layout_height="wrap_content"
       android:layout_gravity="bottom"
       android:theme="@style/ThemeOverlay.AppCompat.Dark"
-      style="@style/Widget.Design.Snackbar" />
\ No newline at end of file
+      style="@style/Widget.Design.Snackbar" />
diff --git a/current/support/design/res/layout/design_layout_snackbar_include.xml b/current/support/design/res/layout/design_layout_snackbar_include.xml
index 14620d3..f2a4eb3 100644
--- a/current/support/design/res/layout/design_layout_snackbar_include.xml
+++ b/current/support/design/res/layout/design_layout_snackbar_include.xml
@@ -15,33 +15,39 @@
   ~ limitations under the License.
 -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<view
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    class="android.support.design.internal.SnackbarContentLayout"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom">
 
     <TextView
-            android:id="@+id/snackbar_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="@dimen/design_snackbar_padding_vertical"
-            android:paddingBottom="@dimen/design_snackbar_padding_vertical"
-            android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
-            android:paddingRight="@dimen/design_snackbar_padding_horizontal"
-            android:textAppearance="@style/TextAppearance.Design.Snackbar.Message"
-            android:maxLines="@integer/design_snackbar_text_max_lines"
-            android:layout_gravity="center_vertical|left|start"
-            android:ellipsize="end"
-            android:textAlignment="viewStart"/>
+        android:id="@+id/snackbar_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="@dimen/design_snackbar_padding_vertical"
+        android:paddingBottom="@dimen/design_snackbar_padding_vertical"
+        android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
+        android:paddingRight="@dimen/design_snackbar_padding_horizontal"
+        android:textAppearance="@style/TextAppearance.Design.Snackbar.Message"
+        android:maxLines="@integer/design_snackbar_text_max_lines"
+        android:layout_gravity="center_vertical|left|start"
+        android:ellipsize="end"
+        android:textAlignment="viewStart"/>
 
     <Button
-            android:id="@+id/snackbar_action"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/design_snackbar_extra_spacing_horizontal"
-            android:layout_marginStart="@dimen/design_snackbar_extra_spacing_horizontal"
-            android:layout_gravity="center_vertical|right|end"
-            android:minWidth="48dp"
-            android:visibility="gone"
-            android:textColor="?attr/colorAccent"
-            style="?attr/borderlessButtonStyle"/>
+        android:id="@+id/snackbar_action"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/design_snackbar_extra_spacing_horizontal"
+        android:layout_marginStart="@dimen/design_snackbar_extra_spacing_horizontal"
+        android:layout_gravity="center_vertical|right|end"
+        android:minWidth="48dp"
+        android:visibility="gone"
+        android:textColor="?attr/colorAccent"
+        style="?attr/borderlessButtonStyle"/>
 
-</merge>
\ No newline at end of file
+</view>
diff --git a/current/support/design/res/layout/design_layout_tab_icon.xml b/current/support/design/res/layout/design_layout_tab_icon.xml
index 5dcfa11..5aa13fb 100644
--- a/current/support/design/res/layout/design_layout_tab_icon.xml
+++ b/current/support/design/res/layout/design_layout_tab_icon.xml
@@ -18,4 +18,4 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
            android:layout_width="24dp"
            android:layout_height="24dp"
-           android:scaleType="centerInside"/>
\ No newline at end of file
+           android:scaleType="centerInside"/>
diff --git a/current/support/design/res/layout/design_layout_tab_text.xml b/current/support/design/res/layout/design_layout_tab_text.xml
index a83bb3d..9ff9609 100644
--- a/current/support/design/res/layout/design_layout_tab_text.xml
+++ b/current/support/design/res/layout/design_layout_tab_text.xml
@@ -20,4 +20,4 @@
           android:layout_height="wrap_content"
           android:ellipsize="end"
           android:gravity="center"
-          android:maxLines="2"/>
\ No newline at end of file
+          android:maxLines="2"/>
diff --git a/current/support/design/res/layout/design_text_input_password_icon.xml b/current/support/design/res/layout/design_text_input_password_icon.xml
index 0dbb9fa..80907a1 100644
--- a/current/support/design/res/layout/design_text_input_password_icon.xml
+++ b/current/support/design/res/layout/design_text_input_password_icon.xml
@@ -16,9 +16,11 @@
 -->
 
 <android.support.design.widget.CheckableImageButton
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/text_input_password_toggle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:layout_gravity="center_vertical|end|right"/>
\ No newline at end of file
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/text_input_password_toggle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical|end|right"
+    android:background="?attr/selectableItemBackgroundBorderless"
+    android:minHeight="48dp"
+    android:minWidth="48dp"/>
diff --git a/current/support/design/res/values-sw600dp/config.xml b/current/support/design/res/values-sw600dp/config.xml
index 58b6207..a5d7692 100644
--- a/current/support/design/res/values-sw600dp/config.xml
+++ b/current/support/design/res/values-sw600dp/config.xml
@@ -19,4 +19,4 @@
 
     <integer name="design_snackbar_text_max_lines">1</integer>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/design/res/values-sw600dp/dimens.xml b/current/support/design/res/values-sw600dp/dimens.xml
index 9d61f00..f63dc9a 100644
--- a/current/support/design/res/values-sw600dp/dimens.xml
+++ b/current/support/design/res/values-sw600dp/dimens.xml
@@ -29,4 +29,4 @@
     <!-- 5 * standard increment (64dp on tablets) -->
     <dimen name="design_navigation_max_width">320dp</dimen>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/design/res/values-v21/styles.xml b/current/support/design/res/values-v21/styles.xml
index 76bde78..9886c15 100644
--- a/current/support/design/res/values-v21/styles.xml
+++ b/current/support/design/res/values-v21/styles.xml
@@ -17,7 +17,7 @@
 <resources>
 
     <style name="Widget.Design.AppBarLayout" parent="Base.Widget.Design.AppBarLayout">
-        <item name="android:stateListAnimator">@anim/design_appbar_state_list_animator</item>
+        <item name="android:stateListAnimator">@animator/design_appbar_state_list_animator</item>
     </style>
 
 </resources>
diff --git a/current/support/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml
index 545a82e..41e0c0f 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -469,6 +469,7 @@
         <attr name="itemIconTint"/>
         <attr name="itemTextColor"/>
         <attr name="itemBackground"/>
+        <attr name="elevation"/>
     </declare-styleable>
 
 </resources>
diff --git a/current/support/design/res/values/colors.xml b/current/support/design/res/values/colors.xml
index ebf6412..57a0811 100644
--- a/current/support/design/res/values/colors.xml
+++ b/current/support/design/res/values/colors.xml
@@ -38,4 +38,6 @@
 
     <color name="design_snackbar_background_color">#323232</color>
 
-</resources>
\ No newline at end of file
+    <color name="design_bottom_navigation_shadow_color">#14000000</color>
+
+</resources>
diff --git a/current/support/design/res/values/config.xml b/current/support/design/res/values/config.xml
index 67635a8..8b028ec 100644
--- a/current/support/design/res/values/config.xml
+++ b/current/support/design/res/values/config.xml
@@ -19,4 +19,4 @@
 
     <integer name="design_snackbar_text_max_lines">2</integer>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/design/res/values/dimens.xml b/current/support/design/res/values/dimens.xml
index 63e98b8..de715ce 100644
--- a/current/support/design/res/values/dimens.xml
+++ b/current/support/design/res/values/dimens.xml
@@ -59,6 +59,8 @@
     <dimen name="design_bottom_sheet_peek_height_min">64dp</dimen>
 
     <dimen name="design_bottom_navigation_height">56dp</dimen>
+    <dimen name="design_bottom_navigation_elevation">8dp</dimen>
+    <dimen name="design_bottom_navigation_shadow_height">1dp</dimen>
     <dimen name="design_bottom_navigation_text_size">12sp</dimen>
     <dimen name="design_bottom_navigation_active_text_size">14sp</dimen>
     <dimen name="design_bottom_navigation_margin">8dp</dimen>
diff --git a/current/support/design/res/values/ids.xml b/current/support/design/res/values/ids.xml
index 91acfd0..ca90284 100644
--- a/current/support/design/res/values/ids.xml
+++ b/current/support/design/res/values/ids.xml
@@ -18,5 +18,8 @@
 
     <item name="view_offset_helper" type="id" />
 
+    <item name="textinput_error" type="id" />
+    <item name="textinput_counter" type="id" />
+
 </resources>
 
diff --git a/current/support/design/res/values/password_visibility.xml b/current/support/design/res/values/password_visibility.xml
new file mode 100644
index 0000000..23faec3
--- /dev/null
+++ b/current/support/design/res/values/password_visibility.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <!-- Resources used in the password visibility anim, see @drawable/design_password_eye -->
+    <string name="path_password_eye_mask_visible">M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z</string>
+    <string name="path_password_eye_mask_strike_through">M2,4.27 L19.73,22 L22.27,19.46 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z</string>
+    <string name="path_password_eye">M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z</string>
+    <string name="path_password_strike_through">M3.27,4.27 L19.74,20.74</string>
+    <integer name="show_password_duration">200</integer>
+    <integer name="hide_password_duration">320</integer>
+
+</resources>
diff --git a/current/support/design/res/values/strings.xml b/current/support/design/res/values/strings.xml
index 35ee706..43a84cd 100644
--- a/current/support/design/res/values/strings.xml
+++ b/current/support/design/res/values/strings.xml
@@ -21,5 +21,7 @@
     <string name="bottom_sheet_behavior" translatable="false">android.support.design.widget.BottomSheetBehavior</string>
     <!-- The text pattern for the character counter -->
     <string name="character_counter_pattern" translatable="false">%1$d / %2$d</string>
+    <!-- Content description for the password visibility toggle button. [CHAR LIMIT=NONE] -->
+    <string name="password_toggle_content_description">Toggle password visibility</string>
 </resources>
 
diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml
index c8b9cd5..0e4b391 100644
--- a/current/support/design/res/values/styles.xml
+++ b/current/support/design/res/values/styles.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Widget.Design.FloatingActionButton" parent="android:Widget">
         <item name="android:background">@drawable/design_fab_background</item>
@@ -44,6 +44,7 @@
 
     <style name="Widget.Design.BottomNavigationView" parent="">
         <item name="itemBackground">?attr/selectableItemBackgroundBorderless</item>
+        <item name="elevation">@dimen/design_bottom_navigation_elevation</item>
     </style>
 
     <style name="Base.Widget.Design.TabLayout" parent="android:Widget">
@@ -68,8 +69,9 @@
         <item name="errorTextAppearance">@style/TextAppearance.Design.Error</item>
         <item name="counterTextAppearance">@style/TextAppearance.Design.Counter</item>
         <item name="counterOverflowTextAppearance">@style/TextAppearance.Design.Counter.Overflow</item>
-        <item name="passwordToggleDrawable">@drawable/design_ic_visibility</item>
+        <item name="passwordToggleDrawable">@drawable/design_password_eye</item>
         <item name="passwordToggleTint">@color/design_tint_password_toggle</item>
+        <item name="passwordToggleContentDescription">@string/password_toggle_content_description</item>
     </style>
 
     <style name="TextAppearance.Design.Hint" parent="TextAppearance.AppCompat.Caption">
@@ -128,7 +130,7 @@
 
     <style name="Widget.Design.BottomSheet.Modal" parent="android:Widget">
         <item name="android:background">?android:attr/colorBackground</item>
-        <item name="android:elevation">@dimen/design_bottom_sheet_modal_elevation</item>
+        <item tools:ignore="NewApi" name="android:elevation">@dimen/design_bottom_sheet_modal_elevation</item>
         <item name="behavior_peekHeight">auto</item>
         <item name="behavior_hideable">true</item>
         <item name="behavior_skipCollapsed">false</item>
diff --git a/current/support/documents-archive/libs/android-support-documents-archive.jar b/current/support/documents-archive/libs/android-support-documents-archive.jar
deleted file mode 100644
index a0a9290..0000000
--- a/current/support/documents-archive/libs/android-support-documents-archive.jar
+++ /dev/null
Binary files differ
diff --git a/current/support/fragment/src/tests/res/layout/double_container.xml b/current/support/fragment/src/tests/res/layout/double_container.xml
new file mode 100644
index 0000000..273146c
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/double_container.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <FrameLayout
+        android:id="@+id/fragmentContainer1"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0px"/>
+    <FrameLayout
+        android:id="@+id/fragmentContainer2"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0px"/>
+</LinearLayout>
diff --git a/current/support/fragment/src/tests/res/layout/nested_inflated_fragment_child.xml b/current/support/fragment/src/tests/res/layout/nested_inflated_fragment_child.xml
new file mode 100644
index 0000000..9a11bc4
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/nested_inflated_fragment_child.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <TextView android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="Test" />
+</LinearLayout>
diff --git a/current/support/fragment/src/tests/res/layout/nested_inflated_fragment_parent.xml b/current/support/fragment/src/tests/res/layout/nested_inflated_fragment_parent.xml
new file mode 100644
index 0000000..e822341
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/nested_inflated_fragment_parent.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <fragment android:name="android.support.v4.app.NestedInflatedFragmentTest$InflatedChildFragment"
+              android:id="@+id/child_fragment"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/current/support/fragment/src/tests/res/layout/scene1.xml b/current/support/fragment/src/tests/res/layout/scene1.xml
new file mode 100644
index 0000000..9bbacf7
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/scene1.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/squareContainer"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <View android:id="@+id/greenSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:transitionName="greenSquare"
+          android:background="#080"/>
+    <View android:id="@+id/blueSquare"
+          android:transitionName="blueSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:background="#008"/>
+</LinearLayout>
diff --git a/current/support/fragment/src/tests/res/layout/scene2.xml b/current/support/fragment/src/tests/res/layout/scene2.xml
new file mode 100644
index 0000000..26d97db
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/scene2.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/squareContainer"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <View android:id="@+id/blueSquare"
+          android:transitionName="blueSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:background="#008"/>
+    <View android:id="@+id/greenSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:transitionName="greenSquare"
+          android:background="#080"/>
+</LinearLayout>
diff --git a/current/support/fragment/src/tests/res/layout/scene3.xml b/current/support/fragment/src/tests/res/layout/scene3.xml
new file mode 100644
index 0000000..6de43ce
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/scene3.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/squareContainer"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <View android:id="@+id/redSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:background="#800"/>
+    <View android:id="@+id/blueSquare"
+          android:transitionName="shared"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:background="#008"/>
+    <View android:id="@+id/greenSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:transitionName="greenSquare"
+          android:background="#080"/>
+</LinearLayout>
diff --git a/current/support/fragment/src/tests/res/layout/simple_container.xml b/current/support/fragment/src/tests/res/layout/simple_container.xml
new file mode 100644
index 0000000..cad1b68
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/simple_container.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/fragmentContainer"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+</FrameLayout>
diff --git a/current/support/fragment/src/tests/res/layout/swipe_refresh_layout_activity.xml b/current/support/fragment/src/tests/res/layout/swipe_refresh_layout_activity.xml
index d925ecf..731836e 100644
--- a/current/support/fragment/src/tests/res/layout/swipe_refresh_layout_activity.xml
+++ b/current/support/fragment/src/tests/res/layout/swipe_refresh_layout_activity.xml
@@ -24,4 +24,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/content"/>
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/current/support/fragment/src/tests/res/layout/text_a.xml b/current/support/fragment/src/tests/res/layout/text_a.xml
new file mode 100644
index 0000000..b164469
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/text_a.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:id="@+id/textA"/>
diff --git a/current/support/fragment/src/tests/res/layout/text_b.xml b/current/support/fragment/src/tests/res/layout/text_b.xml
new file mode 100644
index 0000000..3d307fc
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/text_b.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:id="@+id/textB"/>
diff --git a/current/support/fragment/src/tests/res/layout/text_c.xml b/current/support/fragment/src/tests/res/layout/text_c.xml
new file mode 100644
index 0000000..e40b5ab
--- /dev/null
+++ b/current/support/fragment/src/tests/res/layout/text_c.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:id="@+id/textC"/>
diff --git a/current/support/fragment/src/tests/res/values/dimens.xml b/current/support/fragment/src/tests/res/values/dimens.xml
index c3617a9..46ca94d 100644
--- a/current/support/fragment/src/tests/res/values/dimens.xml
+++ b/current/support/fragment/src/tests/res/values/dimens.xml
@@ -15,4 +15,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <dimen name="text_medium_size">20sp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/fragment/src/tests/res/values/ids.xml b/current/support/fragment/src/tests/res/values/ids.xml
index e5fcf63..2147fef 100644
--- a/current/support/fragment/src/tests/res/values/ids.xml
+++ b/current/support/fragment/src/tests/res/values/ids.xml
@@ -24,4 +24,4 @@
     <item name="page_7" type="id"/>
     <item name="page_8" type="id"/>
     <item name="page_9" type="id"/>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/fragment/src/tests/res/values/strings.xml b/current/support/fragment/src/tests/res/values/strings.xml
index 2fa1430..7a48016 100644
--- a/current/support/fragment/src/tests/res/values/strings.xml
+++ b/current/support/fragment/src/tests/res/values/strings.xml
@@ -15,4 +15,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="hello">Hello World</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/fragment/src/tests/res/values/styles.xml b/current/support/fragment/src/tests/res/values/styles.xml
index ae6325b..d030a00 100644
--- a/current/support/fragment/src/tests/res/values/styles.xml
+++ b/current/support/fragment/src/tests/res/values/styles.xml
@@ -22,4 +22,4 @@
         <item name="android:textColor">@color/text_color</item>
         <item name="android:textStyle">italic</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar b/current/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar
index 13049e5..1b97797 100644
--- a/current/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar
+++ b/current/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar
Binary files differ
diff --git a/current/support/graphics/drawable/libs/android-support-vectordrawable.jar b/current/support/graphics/drawable/libs/android-support-vectordrawable.jar
index 80ad75e..92b95b7 100644
--- a/current/support/graphics/drawable/libs/android-support-vectordrawable.jar
+++ b/current/support/graphics/drawable/libs/android-support-vectordrawable.jar
Binary files differ
diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
index 083a74c..e64c1a5 100644
--- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
+++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
Binary files differ
diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex.jack b/current/support/multidex/instrumentation/libs/android-support-multidex.jack
new file mode 100644
index 0000000..182c12e
--- /dev/null
+++ b/current/support/multidex/instrumentation/libs/android-support-multidex.jack
Binary files differ
diff --git a/current/support/multidex/library/libs/android-support-multidex.jack b/current/support/multidex/library/libs/android-support-multidex.jack
new file mode 100644
index 0000000..182c12e
--- /dev/null
+++ b/current/support/multidex/library/libs/android-support-multidex.jack
Binary files differ
diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar
index edc1ecd..1551fa1 100644
--- a/current/support/multidex/library/libs/android-support-multidex.jar
+++ b/current/support/multidex/library/libs/android-support-multidex.jar
Binary files differ
diff --git a/current/support/percent/libs/android-support-percent.jar b/current/support/percent/libs/android-support-percent.jar
index 8145300..3153275 100644
--- a/current/support/percent/libs/android-support-percent.jar
+++ b/current/support/percent/libs/android-support-percent.jar
Binary files differ
diff --git a/current/support/recommendation/libs/android-support-recommendation.jar b/current/support/recommendation/libs/android-support-recommendation.jar
index c9c55ea..8a62a07 100644
--- a/current/support/recommendation/libs/android-support-recommendation.jar
+++ b/current/support/recommendation/libs/android-support-recommendation.jar
Binary files differ
diff --git a/current/support/transition/libs/android-support-transition.jar b/current/support/transition/libs/android-support-transition.jar
index a0e3e55..f61eb6c 100644
--- a/current/support/transition/libs/android-support-transition.jar
+++ b/current/support/transition/libs/android-support-transition.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 37ff34f..e4c7dfb 100644
--- a/current/support/v13/android-support-v13.jar
+++ b/current/support/v13/android-support-v13.jar
Binary files differ
diff --git a/current/support/v13/src/tests/NO_DOCS b/current/support/v13/src/tests/NO_DOCS
new file mode 100644
index 0000000..092a39c
--- /dev/null
+++ b/current/support/v13/src/tests/NO_DOCS
@@ -0,0 +1,17 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Having this file, named NO_DOCS, in a directory will prevent
+Android javadocs from being generated for java files under
+the directory. This is especially useful for test projects.
diff --git a/current/support/v13/src/tests/res/layout/drag_source_activity.xml b/current/support/v13/src/tests/res/layout/drag_source_activity.xml
new file mode 100644
index 0000000..27cae38
--- /dev/null
+++ b/current/support/v13/src/tests/res/layout/drag_source_activity.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <View
+        android:id="@+id/drag_source"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_margin="10dp"
+        android:background="#ccc"/>
+</LinearLayout>
diff --git a/current/support/v14/preference/libs/android-support-v14-preference.jar b/current/support/v14/preference/libs/android-support-v14-preference.jar
index 36643ed..fbf5e52 100644
--- a/current/support/v14/preference/libs/android-support-v14-preference.jar
+++ b/current/support/v14/preference/libs/android-support-v14-preference.jar
Binary files differ
diff --git a/current/support/v14/preference/res/drawable-v21/preference_list_divider_material.xml b/current/support/v14/preference/res/drawable-v21/preference_list_divider_material.xml
new file mode 100644
index 0000000..a5913de
--- /dev/null
+++ b/current/support/v14/preference/res/drawable-v21/preference_list_divider_material.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2015 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:tint="?android:attr/colorForeground">
+    <solid android:color="#1f000000" />
+    <size
+        android:height="1dp"
+        android:width="1dp" />
+</shape>
diff --git a/current/support/v14/preference/res/drawable/preference_list_divider_material.xml b/current/support/v14/preference/res/drawable/preference_list_divider_material.xml
index a5913de..fc91d07 100644
--- a/current/support/v14/preference/res/drawable/preference_list_divider_material.xml
+++ b/current/support/v14/preference/res/drawable/preference_list_divider_material.xml
@@ -15,8 +15,7 @@
   limitations under the License
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:tint="?android:attr/colorForeground">
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#1f000000" />
     <size
         android:height="1dp"
diff --git a/current/support/v14/preference/res/layout/preference_widget_switch.xml b/current/support/v14/preference/res/layout/preference_widget_switch.xml
index afc4351..47e9397 100644
--- a/current/support/v14/preference/res/layout/preference_widget_switch.xml
+++ b/current/support/v14/preference/res/layout/preference_widget_switch.xml
@@ -18,9 +18,11 @@
 <!-- Layout used by SwitchPreference for the switch widget style. This is inflated
      inside android.R.layout.preference. -->
 <Switch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/switch_widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:focusable="false"
-    android:clickable="false"
-    android:background="@null" />
+        xmlns:tools="http://schemas.android.com/tools"
+        tools:ignore="NewApi"
+        android:id="@android:id/switch_widget"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:clickable="false"
+        android:background="@null" />
diff --git a/current/support/v14/preference/res/values/styles.xml b/current/support/v14/preference/res/values/styles.xml
index a83417a..baef67f 100644
--- a/current/support/v14/preference/res/values/styles.xml
+++ b/current/support/v14/preference/res/values/styles.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Preference.SwitchPreference">
         <item name="android:widgetLayout">@layout/preference_widget_switch</item>
         <item name="android:switchTextOn">@string/v7_preference_on</item>
@@ -66,14 +66,14 @@
 
     <style name="Preference_TextAppearanceMaterialBody2">
         <item name="android:textSize">14sp</item>
-        <item name="android:fontFamily">sans-serif</item>
+        <item tools:ignore="NewApi" name="android:fontFamily">sans-serif</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textStyle">normal</item>
     </style>
 
     <style name="Preference_TextAppearanceMaterialSubhead">
         <item name="android:textSize">16sp</item>
-        <item name="android:fontFamily">sans-serif</item>
+        <item tools:ignore="NewApi" name="android:fontFamily">sans-serif</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textStyle">normal</item>
     </style>
diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
index e9f87a3..3484f3f 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
Binary files differ
diff --git a/current/support/v17/leanback/res/animator/lb_onboarding_description_enter.xml b/current/support/v17/leanback/res/animator/lb_onboarding_description_enter.xml
index 5f26cdd..3cb5843 100644
--- a/current/support/v17/leanback/res/animator/lb_onboarding_description_enter.xml
+++ b/current/support/v17/leanback/res/animator/lb_onboarding_description_enter.xml
@@ -21,11 +21,13 @@
         android:valueFrom="0.0"
         android:valueTo="1.0"
         android:duration="533"
+        android:startOffset="@integer/lb_onboarding_header_description_delay"
         android:interpolator="@android:interpolator/fast_out_slow_in" />
     <objectAnimator
         android:propertyName="translationY"
         android:valueFrom="60dp"
         android:valueTo="0dp"
         android:duration="533"
+        android:startOffset="@integer/lb_onboarding_header_description_delay"
         android:interpolator="@android:interpolator/fast_out_slow_in" />
 </set>
diff --git a/current/support/v17/leanback/res/animator/lb_onboarding_title_enter.xml b/current/support/v17/leanback/res/animator/lb_onboarding_title_enter.xml
index 5f26cdd..9b65b48 100644
--- a/current/support/v17/leanback/res/animator/lb_onboarding_title_enter.xml
+++ b/current/support/v17/leanback/res/animator/lb_onboarding_title_enter.xml
@@ -21,11 +21,13 @@
         android:valueFrom="0.0"
         android:valueTo="1.0"
         android:duration="533"
+        android:startOffset="@integer/lb_onboarding_header_title_delay"
         android:interpolator="@android:interpolator/fast_out_slow_in" />
     <objectAnimator
         android:propertyName="translationY"
         android:valueFrom="60dp"
         android:valueTo="0dp"
         android:duration="533"
+        android:startOffset="@integer/lb_onboarding_header_title_delay"
         android:interpolator="@android:interpolator/fast_out_slow_in" />
 </set>
diff --git a/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml b/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml
index 3cd9699..75ce912 100644
--- a/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml
+++ b/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml
@@ -17,4 +17,4 @@
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?android:attr/colorControlHighlight" >
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml b/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml
index a006889..4f91ff0 100644
--- a/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml
+++ b/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml
@@ -34,4 +34,4 @@
         </selector>
     </item>
 
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml b/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml
index 6623f6e..3beab65 100644
--- a/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml
+++ b/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml
@@ -34,4 +34,4 @@
         </selector>
     </item>
 
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/current/support/v17/leanback/res/drawable/lb_background.xml b/current/support/v17/leanback/res/drawable/lb_background.xml
index 4732bc1..305a228 100644
--- a/current/support/v17/leanback/res/drawable/lb_background.xml
+++ b/current/support/v17/leanback/res/drawable/lb_background.xml
@@ -15,11 +15,8 @@
      limitations under the License.
 -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@color/lb_grey" android:id="@+id/background_theme"/>
-    <item android:drawable="@color/lb_grey" android:id="@+id/background_color"/>
     <!-- Replaced at runtime with image to fade out -->
     <item android:drawable="@color/lb_grey" android:id="@+id/background_imageout"/>
     <!-- Replaced at runtime with image to fade in -->
     <item android:drawable="@color/lb_grey" android:id="@+id/background_imagein"/>
-    <item android:drawable="@color/lb_background_protection" android:id="@+id/background_dim" />
 </layer-list>
diff --git a/current/support/v17/leanback/res/drawable/lb_playback_now_playing_bar.xml b/current/support/v17/leanback/res/drawable/lb_playback_now_playing_bar.xml
index 33a1c4b..3b4d92d 100644
--- a/current/support/v17/leanback/res/drawable/lb_playback_now_playing_bar.xml
+++ b/current/support/v17/leanback/res/drawable/lb_playback_now_playing_bar.xml
@@ -23,4 +23,4 @@
             android:height="@dimen/lb_playback_now_playing_bar_height"
             android:width="@dimen/lb_playback_now_playing_bar_width" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/v17/leanback/res/layout/lb_control_button_primary.xml b/current/support/v17/leanback/res/layout/lb_control_button_primary.xml
index af94487..5da24e4 100644
--- a/current/support/v17/leanback/res/layout/lb_control_button_primary.xml
+++ b/current/support/v17/leanback/res/layout/lb_control_button_primary.xml
@@ -40,4 +40,4 @@
         android:layout_gravity="center"
         style="?attr/playbackControlButtonLabelStyle" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_control_button_secondary.xml b/current/support/v17/leanback/res/layout/lb_control_button_secondary.xml
index 4d0cafd..39d5654 100644
--- a/current/support/v17/leanback/res/layout/lb_control_button_secondary.xml
+++ b/current/support/v17/leanback/res/layout/lb_control_button_secondary.xml
@@ -33,4 +33,4 @@
         android:layout_height="@dimen/lb_control_icon_height"
         android:layout_gravity="center" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_details_fragment.xml b/current/support/v17/leanback/res/layout/lb_details_fragment.xml
index 15328e4..fd0133f 100644
--- a/current/support/v17/leanback/res/layout/lb_details_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_details_fragment.xml
@@ -14,16 +14,24 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v17.leanback.widget.BrowseFrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dummy"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <android.support.v17.leanback.widget.BrowseFrameLayout
+    <FrameLayout
+        android:id="@+id/video_surface_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <android.support.v17.leanback.widget.NonOverlappingFrameLayout
+            android:id="@+id/details_background_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    <FrameLayout
         android:id="@+id/details_fragment_root"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:descendantFocusability="afterDescendants"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
@@ -32,6 +40,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent" />
 
-    </android.support.v17.leanback.widget.BrowseFrameLayout>
+    </FrameLayout>
 
-</FrameLayout>
+</android.support.v17.leanback.widget.BrowseFrameLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_guidedstep_fragment.xml b/current/support/v17/leanback/res/layout/lb_guidedstep_fragment.xml
index adf9d4f..bbe21ba 100644
--- a/current/support/v17/leanback/res/layout/lb_guidedstep_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_guidedstep_fragment.xml
@@ -33,6 +33,7 @@
         <LinearLayout
             android:id="@+id/content_frame"
             android:orientation="horizontal"
+            android:baselineAligned="false"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -40,8 +41,7 @@
                 android:id="@+id/content_fragment"
                 android:layout_width="0dp"
                 android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:layout_alignParentStart="true" />
+                android:layout_height="match_parent" />
 
             <android.support.v17.leanback.widget.NonOverlappingFrameLayout
                 android:id="@+id/action_fragment_root"
@@ -53,8 +53,7 @@
                 android:paddingStart="@dimen/lb_guidedactions_section_shadow_width"
                 android:layout_width="0dp"
                 android:layout_weight="?attr/guidedActionContentWidthWeight"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true">
+                android:layout_height="match_parent" >
 
                 <android.support.v17.leanback.widget.NonOverlappingView
                     android:id="@+id/action_fragment_background"
diff --git a/current/support/v17/leanback/res/layout/lb_image_card_view.xml b/current/support/v17/leanback/res/layout/lb_image_card_view.xml
index 5b37dcf..bd079a9 100644
--- a/current/support/v17/leanback/res/layout/lb_image_card_view.xml
+++ b/current/support/v17/leanback/res/layout/lb_image_card_view.xml
@@ -27,4 +27,4 @@
         style="?attr/imageCardViewInfoAreaStyle">
     </android.support.v17.leanback.widget.NonOverlappingRelativeLayout>
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/current/support/v17/leanback/res/layout/lb_image_card_view_themed_badge_left.xml b/current/support/v17/leanback/res/layout/lb_image_card_view_themed_badge_left.xml
index 3683e64..6d40c07 100644
--- a/current/support/v17/leanback/res/layout/lb_image_card_view_themed_badge_left.xml
+++ b/current/support/v17/leanback/res/layout/lb_image_card_view_themed_badge_left.xml
@@ -20,4 +20,4 @@
     android:layout_alignBottom="@+id/content_text"
     android:layout_alignParentStart="true"
     android:layout_marginEnd="@dimen/lb_basic_card_info_badge_margin"
-    style="?attr/imageCardViewBadgeStyle" />
\ No newline at end of file
+    style="?attr/imageCardViewBadgeStyle" />
diff --git a/current/support/v17/leanback/res/layout/lb_image_card_view_themed_badge_right.xml b/current/support/v17/leanback/res/layout/lb_image_card_view_themed_badge_right.xml
index 481e0d1..5672025 100644
--- a/current/support/v17/leanback/res/layout/lb_image_card_view_themed_badge_right.xml
+++ b/current/support/v17/leanback/res/layout/lb_image_card_view_themed_badge_right.xml
@@ -20,4 +20,4 @@
     android:layout_alignBottom="@+id/content_text"
     android:layout_alignParentEnd="true"
     android:layout_marginStart="@dimen/lb_basic_card_info_badge_margin"
-    style="?attr/imageCardViewBadgeStyle" />
\ No newline at end of file
+    style="?attr/imageCardViewBadgeStyle" />
diff --git a/current/support/v17/leanback/res/layout/lb_list_row_hovercard.xml b/current/support/v17/leanback/res/layout/lb_list_row_hovercard.xml
index a001dc9..73e3f5b 100644
--- a/current/support/v17/leanback/res/layout/lb_list_row_hovercard.xml
+++ b/current/support/v17/leanback/res/layout/lb_list_row_hovercard.xml
@@ -29,4 +29,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="?attr/rowHoverCardDescriptionStyle" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_media_item_number_view_flipper.xml b/current/support/v17/leanback/res/layout/lb_media_item_number_view_flipper.xml
index 8625d84..f83a34b 100644
--- a/current/support/v17/leanback/res/layout/lb_media_item_number_view_flipper.xml
+++ b/current/support/v17/leanback/res/layout/lb_media_item_number_view_flipper.xml
@@ -41,4 +41,4 @@
             android:visibility="gone"/>
 
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/current/support/v17/leanback/res/layout/lb_media_list_header.xml b/current/support/v17/leanback/res/layout/lb_media_list_header.xml
index f6fcd1c..e6861e5 100644
--- a/current/support/v17/leanback/res/layout/lb_media_list_header.xml
+++ b/current/support/v17/leanback/res/layout/lb_media_list_header.xml
@@ -22,4 +22,4 @@
                 android:id="@+id/mediaListHeader"
                 style="?attr/playbackMediaListHeaderTitleStyle"
         />
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_onboarding_fragment.xml b/current/support/v17/leanback/res/layout/lb_onboarding_fragment.xml
index 04bd0ea..823fe74 100644
--- a/current/support/v17/leanback/res/layout/lb_onboarding_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_onboarding_fragment.xml
@@ -28,10 +28,15 @@
         android:layout_height="match_parent"
         android:visibility="gone" />
 
+    <ImageView
+        android:id="@+id/main_icon"
+        style="?attr/onboardingMainIconStyle"/>
+
     <LinearLayout
         android:id="@+id/page_container"
         style="?attr/onboardingHeaderStyle"
         android:visibility="gone">
+
         <TextView
             android:id="@+id/title"
             style="?attr/onboardingTitleStyle"/>
diff --git a/current/support/v17/leanback/res/layout/lb_playback_controls.xml b/current/support/v17/leanback/res/layout/lb_playback_controls.xml
index dda7e06..8ab938c 100644
--- a/current/support/v17/leanback/res/layout/lb_playback_controls.xml
+++ b/current/support/v17/leanback/res/layout/lb_playback_controls.xml
@@ -81,4 +81,4 @@
         </FrameLayout>
     </android.support.v17.leanback.widget.PersistentFocusWrapper>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_playback_fragment.xml b/current/support/v17/leanback/res/layout/lb_playback_fragment.xml
index 93cc0c0..85d52cf 100644
--- a/current/support/v17/leanback/res/layout/lb_playback_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_playback_fragment.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/playback_fragment_root"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/current/support/v17/leanback/res/layout/lb_playback_now_playing_bars.xml b/current/support/v17/leanback/res/layout/lb_playback_now_playing_bars.xml
index d9b30b7..b55a3c8 100644
--- a/current/support/v17/leanback/res/layout/lb_playback_now_playing_bars.xml
+++ b/current/support/v17/leanback/res/layout/lb_playback_now_playing_bars.xml
@@ -45,4 +45,4 @@
             android:src="@drawable/lb_playback_now_playing_bar"
     />
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/current/support/v17/leanback/res/layout/lb_row_container.xml b/current/support/v17/leanback/res/layout/lb_row_container.xml
index 31b0f58..450e7a8 100644
--- a/current/support/v17/leanback/res/layout/lb_row_container.xml
+++ b/current/support/v17/leanback/res/layout/lb_row_container.xml
@@ -23,4 +23,4 @@
     style="?attr/rowHeaderDockStyle"
     android:clipToPadding="false">
 </android.support.v17.leanback.widget.NonOverlappingLinearLayout>
-</merge>
\ No newline at end of file
+</merge>
diff --git a/current/support/v17/leanback/res/layout/lb_row_media_item.xml b/current/support/v17/leanback/res/layout/lb_row_media_item.xml
index b25e922..f515a59 100644
--- a/current/support/v17/leanback/res/layout/lb_row_media_item.xml
+++ b/current/support/v17/leanback/res/layout/lb_row_media_item.xml
@@ -69,4 +69,4 @@
         </LinearLayout>
 
     </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_rows_fragment.xml b/current/support/v17/leanback/res/layout/lb_rows_fragment.xml
index fc5e706..e2b76c5 100644
--- a/current/support/v17/leanback/res/layout/lb_rows_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_rows_fragment.xml
@@ -20,4 +20,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    style="?attr/rowsVerticalGridStyle" />
\ No newline at end of file
+    style="?attr/rowsVerticalGridStyle" />
diff --git a/current/support/v17/leanback/res/layout/lb_shadow.xml b/current/support/v17/leanback/res/layout/lb_shadow.xml
index af4e4aa..41a80d6 100644
--- a/current/support/v17/leanback/res/layout/lb_shadow.xml
+++ b/current/support/v17/leanback/res/layout/lb_shadow.xml
@@ -27,4 +27,4 @@
         android:background="@drawable/lb_card_shadow_focused"
         android:alpha="0" />
 
-</merge>
\ No newline at end of file
+</merge>
diff --git a/current/support/v7/appcompat/res/layout/notification_media_action.xml b/current/support/v17/leanback/res/layout/lb_video_surface.xml
similarity index 60%
copy from current/support/v7/appcompat/res/layout/notification_media_action.xml
copy to current/support/v17/leanback/res/layout/lb_video_surface.xml
index d546792..a3b0fe0 100644
--- a/current/support/v7/appcompat/res/layout/notification_media_action.xml
+++ b/current/support/v17/leanback/res/layout/lb_video_surface.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!--
+     Copyright (C) 2014 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,13 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-    style="?android:attr/borderlessButtonStyle"
-    android:id="@+id/action0"
-    android:layout_width="48dp"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="2dp"
-    android:layout_marginRight="2dp"
-    android:layout_weight="1"
-    android:gravity="center"/>
\ No newline at end of file
+<SurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_surface"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/current/support/v7/appcompat/res/layout/notification_media_action.xml b/current/support/v17/leanback/res/layout/video_surface_fragment.xml
similarity index 60%
copy from current/support/v7/appcompat/res/layout/notification_media_action.xml
copy to current/support/v17/leanback/res/layout/video_surface_fragment.xml
index d546792..2c43a39 100644
--- a/current/support/v7/appcompat/res/layout/notification_media_action.xml
+++ b/current/support/v17/leanback/res/layout/video_surface_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!--
+     Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,13 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-    style="?android:attr/borderlessButtonStyle"
-    android:id="@+id/action0"
-    android:layout_width="48dp"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="2dp"
-    android:layout_marginRight="2dp"
-    android:layout_weight="1"
-    android:gravity="center"/>
\ No newline at end of file
+<SurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+</SurfaceView>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_browse_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_browse_enter_transition.xml
index 4ad9888..f8de5ff 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_browse_enter_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_browse_enter_transition.xml
@@ -19,4 +19,4 @@
   <fade
       android:interpolator="@android:interpolator/linear_out_slow_in"
       android:duration="150"/>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_browse_entrance_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_browse_entrance_transition.xml
index 9dd440b..1457d65 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_browse_entrance_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_browse_entrance_transition.xml
@@ -25,4 +25,4 @@
       android:interpolator="@android:interpolator/linear_out_slow_in"
       android:slideEdge="@integer/slideEdgeEnd">
   </slide>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_browse_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_browse_return_transition.xml
index 6d341b5..4de8902 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_browse_return_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_browse_return_transition.xml
@@ -40,4 +40,4 @@
           <target android:excludeId="@+id/browse_headers_root" />
       </targets>
   </fade>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_details_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_details_enter_transition.xml
index a9ebb3d..0735a7c 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_details_enter_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_details_enter_transition.xml
@@ -24,10 +24,18 @@
           <target android:excludeId="@id/title_badge" />
           <target android:excludeId="@id/title_text" />
           <target android:excludeId="@id/title_orb" />
+          <target android:excludeId="@id/details_background_view" />
+      </targets>
+  </transition>
+  <!-- The ParallaxTransition runs with with Slide transition, must use same duration
+    and same startDelay-->
+  <transition class="android.support.v17.leanback.transition.ParallaxTransition"
+    android:duration="500">
+      <targets>
+          <target android:targetId="@id/details_frame" />
       </targets>
   </transition>
   <fade
-      android:interpolator="@android:interpolator/linear_out_slow_in"
       android:duration="350">
   </fade>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_details_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_details_return_transition.xml
index f31ebcb..c3096b7 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_details_return_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_details_return_transition.xml
@@ -23,10 +23,18 @@
           <target android:excludeId="@id/title_badge" />
           <target android:excludeId="@id/title_text" />
           <target android:excludeId="@id/title_orb" />
+          <target android:excludeId="@id/details_background_view" />
+      </targets>
+  </transition>
+    <!-- The ParallaxTransition runs with with Slide transition, must use same duration
+      and same startDelay-->
+  <transition class="android.support.v17.leanback.transition.ParallaxTransition"
+      android:duration="350">
+      <targets>
+          <target android:targetId="@id/details_frame" />
       </targets>
   </transition>
   <fade
-      android:interpolator="@android:interpolator/fast_out_linear_in"
       android:duration="350">
   </fade>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml
index 1572934..69ef9db 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml
@@ -20,4 +20,4 @@
       android:interpolator="@android:interpolator/linear_out_slow_in"
       android:startDelay="175"
       android:duration="400"/>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_guidedstep_activity_enter.xml b/current/support/v17/leanback/res/transition-v21/lb_guidedstep_activity_enter.xml
index 40f821a..6b5b152 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_guidedstep_activity_enter.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_guidedstep_activity_enter.xml
@@ -50,4 +50,4 @@
             <target android:targetId="@id/guidedactions_list2" />
         </targets>
   </slide>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
index a671954..f442497 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
@@ -28,4 +28,4 @@
   <changeImageTransform
       android:interpolator="@android:interpolator/linear_out_slow_in"
       android:duration="500"/>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml
index ee008e0..90ef1ad 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml
@@ -29,4 +29,4 @@
   <changeImageTransform
       android:interpolator="@android:interpolator/linear_out_slow_in"
       android:duration="325"/>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_enter_transition.xml
index 00466cb..fa2c493 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_enter_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_enter_transition.xml
@@ -19,4 +19,4 @@
   <fade
       android:interpolator="@android:interpolator/linear_out_slow_in"
       android:duration="150"/>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_entrance_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_entrance_transition.xml
index ee06953..81b480c 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_entrance_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_entrance_transition.xml
@@ -21,4 +21,4 @@
       android:interpolator="@android:interpolator/linear_out_slow_in"
       android:slideEdge="bottom">
   </slide>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_return_transition.xml
index edb3816..463e701 100644
--- a/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_return_transition.xml
+++ b/current/support/v17/leanback/res/transition-v21/lb_vertical_grid_return_transition.xml
@@ -29,4 +29,4 @@
       android:interpolator="@android:interpolator/fast_out_linear_in"
       android:duration="350">
   </fade>
-</transitionSet>
\ No newline at end of file
+</transitionSet>
diff --git a/current/support/v17/leanback/res/values-ldrtl/integers.xml b/current/support/v17/leanback/res/values-ldrtl/integers.xml
index 250523d..a052a9c 100644
--- a/current/support/v17/leanback/res/values-ldrtl/integers.xml
+++ b/current/support/v17/leanback/res/values-ldrtl/integers.xml
@@ -21,4 +21,4 @@
     <!-- Gravity.LEFT -->
     <integer name="slideEdgeEnd">3</integer>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v17/leanback/res/values-v21/styles.xml b/current/support/v17/leanback/res/values-v21/styles.xml
index 89029c4..85ead74 100644
--- a/current/support/v17/leanback/res/values-v21/styles.xml
+++ b/current/support/v17/leanback/res/values-v21/styles.xml
@@ -25,4 +25,4 @@
         <item name="android:background">@drawable/lb_action_bg</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v17/leanback/res/values-v22/integers.xml b/current/support/v17/leanback/res/values-v22/integers.xml
index fdd7792..b8bbe89 100644
--- a/current/support/v17/leanback/res/values-v22/integers.xml
+++ b/current/support/v17/leanback/res/values-v22/integers.xml
@@ -21,4 +21,4 @@
     <!-- Gravity.END -->
     <integer name="slideEdgeEnd">0x800005</integer>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v17/leanback/res/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml
index 870d958..26c5ef7 100644
--- a/current/support/v17/leanback/res/values/attrs.xml
+++ b/current/support/v17/leanback/res/values/attrs.xml
@@ -559,6 +559,10 @@
         <!-- Theme attribute for the style of the logo in onboarding screen. Default is
              {@link android.support.v17.leanback.R.style#Widget_Leanback_OnboardingLogoStyle}.-->
         <attr name="onboardingLogoStyle" format="reference" />
+
+        <!-- Theme attribute for the style of the main icon in onboarding fragment. Default is
+             {@link android.support.v17.leanback.R.style#Widget_Leanback_OnboardingMainIconStyle}.-->
+        <attr name="onboardingMainIconStyle" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="PagingIndicator">
diff --git a/current/support/v17/leanback/res/values/ids.xml b/current/support/v17/leanback/res/values/ids.xml
index ab7f568..59b8b8f 100644
--- a/current/support/v17/leanback/res/values/ids.xml
+++ b/current/support/v17/leanback/res/values/ids.xml
@@ -20,6 +20,8 @@
      <item type="id" name="lb_slide_transition_value" />
      <item type="id" name="transitionPosition" />
 
+     <item type="id" name="lb_parallax_source" />
+
      <item type="id" name="lb_guidedstep_background" />
 
      <item type="id" name="lb_control_play_pause" />
diff --git a/current/support/v17/leanback/res/values/integers.xml b/current/support/v17/leanback/res/values/integers.xml
index c9f3384..b8bdb18 100644
--- a/current/support/v17/leanback/res/values/integers.xml
+++ b/current/support/v17/leanback/res/values/integers.xml
@@ -29,6 +29,8 @@
     <integer name="lb_playback_rows_fade_out_ms">250</integer>
     <integer name="lb_playback_rows_fade_delay_ms">100</integer>
     <integer name="lb_playback_controls_show_time_ms">3000</integer>
+    <integer name="lb_onboarding_header_title_delay">33</integer>
+    <integer name="lb_onboarding_header_description_delay">33</integer>
 
     <!-- Gravity.LEFT -->
     <integer name="slideEdgeStart">3</integer>
diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml
index dbe090a..d10260d 100644
--- a/current/support/v17/leanback/res/values/styles.xml
+++ b/current/support/v17/leanback/res/values/styles.xml
@@ -778,4 +778,15 @@
         <item name="android:contentDescription">@null</item>
     </style>
 
+    <!-- Styles for the main icon in OnboardingFragment. -->
+    <style name="Widget.Leanback.OnboardingMainIconStyle">
+        <item name="android:layout_width">64dp</item>
+        <item name="android:layout_height">64dp</item>
+        <item name="android:layout_above">@id/page_container</item>
+        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_marginBottom">16dp</item>
+        <item name="android:contentDescription">@null</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
 </resources>
diff --git a/current/support/v17/leanback/res/values/themes.xml b/current/support/v17/leanback/res/values/themes.xml
index c6d6baa..e5b98f6 100644
--- a/current/support/v17/leanback/res/values/themes.xml
+++ b/current/support/v17/leanback/res/values/themes.xml
@@ -213,6 +213,7 @@
         <item name="onboardingPageIndicatorStyle">@style/Widget.Leanback.OnboardingPageIndicatorStyle</item>
         <item name="onboardingStartButtonStyle">@style/Widget.Leanback.OnboardingStartButtonStyle</item>
         <item name="onboardingLogoStyle">@style/Widget.Leanback.OnboardingLogoStyle</item>
+        <item name="onboardingMainIconStyle">@style/Widget.Leanback.OnboardingMainIconStyle</item>
     </style>
 
 </resources>
diff --git a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
index a2f19de..0c710ea 100644
--- a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
+++ b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
Binary files differ
diff --git a/current/support/v17/preference-leanback/res/layout-v21/leanback_preference_category.xml b/current/support/v17/preference-leanback/res/layout-v21/leanback_preference_category.xml
new file mode 100644
index 0000000..3e04793
--- /dev/null
+++ b/current/support/v17/preference-leanback/res/layout-v21/leanback_preference_category.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/lb_preference_category_height"
+    android:clipToPadding="false"
+    android:paddingStart="@dimen/lb_preference_item_padding_start"
+    android:paddingEnd="@dimen/lb_preference_item_padding_end">
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:fontFamily="sans-serif-condensed"
+        android:textColor="?android:attr/colorAccent"
+        android:textSize="@dimen/lb_preference_category_text_size"/>
+</FrameLayout>
diff --git a/current/support/v17/preference-leanback/res/layout/leanback_preference_category.xml b/current/support/v17/preference-leanback/res/layout/leanback_preference_category.xml
index 97bb3f0..cfc5f1a 100644
--- a/current/support/v17/preference-leanback/res/layout/leanback_preference_category.xml
+++ b/current/support/v17/preference-leanback/res/layout/leanback_preference_category.xml
@@ -28,6 +28,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start|center_vertical"
         android:fontFamily="sans-serif-condensed"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="?android:attr/textColorPrimary"
         android:textSize="@dimen/lb_preference_category_text_size"/>
 </FrameLayout>
diff --git a/current/support/v17/preference-leanback/res/layout/leanback_preference_widget_seekbar.xml b/current/support/v17/preference-leanback/res/layout/leanback_preference_widget_seekbar.xml
new file mode 100644
index 0000000..7aa6cd2
--- /dev/null
+++ b/current/support/v17/preference-leanback/res/layout/leanback_preference_widget_seekbar.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Leanback-styled Layout used for a SeekBar preference -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:gravity="center_vertical"
+              android:paddingStart="@dimen/lb_preference_item_padding_start"
+              android:paddingEnd="@dimen/lb_preference_item_padding_end"
+              android:clickable="true"
+              android:focusable="true"
+              android:clipChildren="false"
+              android:clipToPadding="false">
+
+    <ImageView
+            android:id="@+android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:minWidth="@dimen/preference_icon_minWidth"/>
+
+    <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1"
+            android:clipChildren="false"
+            android:clipToPadding="false">
+
+        <TextView android:id="@+android:id/title"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:layout_marginBottom="@dimen/lb_preference_item_primary_text_margin_bottom"
+                  android:fontFamily="sans-serif-condensed"
+                  android:ellipsize="marquee"
+                  android:fadingEdge="horizontal"
+                  android:textColor="@color/lb_preference_item_primary_text_color"
+                  android:textSize="@dimen/lb_preference_item_primary_text_size"/>
+
+        <TextView android:id="@+android:id/summary"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@android:id/title"
+                  android:layout_alignStart="@android:id/title"
+                  android:fontFamily="sans-serif-condensed"
+                  android:textColor="@color/lb_preference_item_secondary_text_color"
+                  android:textSize="@dimen/lb_preference_item_secondary_text_size"
+                  android:maxLines="4" />
+
+        <!-- Using UnPressableLinearLayout as a workaround to disable the pressed state propagation
+        to the children of this container layout. Otherwise, the animated pressed state will also
+        play for the thumb in the AbsSeekBar in addition to the preference's ripple background.
+        The background of the SeekBar is also set to null to disable the ripple background -->
+        <android.support.v7.preference.UnPressableLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/summary"
+                android:layout_alignStart="@android:id/title"
+                android:clipChildren="false"
+                android:clipToPadding="false">
+            <SeekBar
+                    android:id="@+id/seekbar"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/lb_preference_seekbar_padding_start"
+                    android:paddingEnd="@dimen/lb_preference_seekbar_padding_end"
+                    android:focusable="false"
+                    android:clickable="false"
+                    android:background="@null" />
+
+            <TextView android:id="@+id/seekbar_value"
+                      android:layout_width="@dimen/lb_preference_seekbar_value_width"
+                      android:layout_height="match_parent"
+                      android:gravity="right|center_vertical"
+                      android:fontFamily="sans-serif-condensed"
+                      android:textColor="@color/lb_preference_item_primary_text_color"
+                      android:textSize="@dimen/lb_preference_item_primary_text_size"/>
+        </android.support.v7.preference.UnPressableLinearLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/current/support/v17/preference-leanback/res/values/dimens.xml b/current/support/v17/preference-leanback/res/values/dimens.xml
index f3d36af..ed662a1 100644
--- a/current/support/v17/preference-leanback/res/values/dimens.xml
+++ b/current/support/v17/preference-leanback/res/values/dimens.xml
@@ -38,4 +38,7 @@
     <dimen name="lb_preference_category_height">40dp</dimen>
 
     <dimen name="lb_settings_pane_width">360dp</dimen>
+    <dimen name="lb_preference_seekbar_padding_start">0dp</dimen>
+    <dimen name="lb_preference_seekbar_padding_end">22dp</dimen>
+    <dimen name="lb_preference_seekbar_value_width">36dp</dimen>
 </resources>
diff --git a/current/support/v17/preference-leanback/res/values/styles.xml b/current/support/v17/preference-leanback/res/values/styles.xml
index fbb1ad0..cb12b3a 100644
--- a/current/support/v17/preference-leanback/res/values/styles.xml
+++ b/current/support/v17/preference-leanback/res/values/styles.xml
@@ -50,6 +50,12 @@
         <item name="android:switchTextOff">@string/v7_preference_off</item>
     </style>
 
+    <style name="LeanbackPreference.SeekBarPreference">
+        <item name="android:layout">@layout/leanback_preference_widget_seekbar</item>
+        <item name="adjustable">true</item>
+        <item name="showSeekBarValue">true</item>
+    </style>
+
     <style name="LeanbackPreference.PreferenceScreen">
     </style>
 
diff --git a/current/support/v17/preference-leanback/res/values/themes.xml b/current/support/v17/preference-leanback/res/values/themes.xml
index 591fdfa..d173b30 100644
--- a/current/support/v17/preference-leanback/res/values/themes.xml
+++ b/current/support/v17/preference-leanback/res/values/themes.xml
@@ -25,6 +25,7 @@
         <item name="preferenceInformationStyle">@style/LeanbackPreference.Information</item>
         <item name="checkBoxPreferenceStyle">@style/LeanbackPreference.CheckBoxPreference</item>
         <item name="switchPreferenceCompatStyle">@style/LeanbackPreference.SwitchPreferenceCompat</item>
+        <item name="seekBarPreferenceStyle">@style/LeanbackPreference.SeekBarPreference</item>
         <item name="switchPreferenceStyle">@style/LeanbackPreference.SwitchPreference</item>
         <item name="dialogPreferenceStyle">@style/LeanbackPreference.DialogPreference</item>
         <item name="editTextPreferenceStyle">@style/LeanbackPreference.DialogPreference.EditTextPreference</item>
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index d683add..c6db0e2 100644
--- a/current/support/v4/android-support-v4.jar
+++ b/current/support/v4/android-support-v4.jar
Binary files differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
index d9cc056..caef2fa 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
Binary files differ
diff --git a/current/support/v7/appcompat/res-public/values/public_attrs.xml b/current/support/v7/appcompat/res-public/values/public_attrs.xml
index 6ffa864..3961f49 100644
--- a/current/support/v7/appcompat/res-public/values/public_attrs.xml
+++ b/current/support/v7/appcompat/res-public/values/public_attrs.xml
@@ -66,7 +66,7 @@
      <public type="attr" name="buttonBarNeutralButtonStyle"/>
      <public type="attr" name="buttonBarPositiveButtonStyle"/>
      <public type="attr" name="buttonBarStyle"/>
-     <public type="attr" name="buttonGravity" />
+     <public type="attr" name="buttonGravity"/>
      <public type="attr" name="buttonStyle"/>
      <public type="attr" name="buttonStyleSmall"/>
      <public type="attr" name="buttonTint"/>
@@ -131,7 +131,7 @@
      <public type="attr" name="listPreferredItemPaddingRight"/>
      <public type="attr" name="logo"/>
      <public type="attr" name="logoDescription"/>
-     <public type="attr" name="maxButtonHeight" />
+     <public type="attr" name="maxButtonHeight"/>
      <public type="attr" name="measureWithLargestChild"/>
      <public type="attr" name="navigationContentDescription"/>
      <public type="attr" name="navigationIcon"/>
@@ -166,6 +166,7 @@
      <public type="attr" name="spinnerStyle"/>
      <public type="attr" name="splitTrack"/>
      <public type="attr" name="srcCompat"/>
+     <public type="attr" name="state_above_anchor"/>
      <public type="attr" name="submitBackground"/>
      <public type="attr" name="subtitle"/>
      <public type="attr" name="subtitleTextAppearance"/>
@@ -188,13 +189,15 @@
      <public type="attr" name="theme"/>
      <public type="attr" name="thickness"/>
      <public type="attr" name="thumbTextPadding"/>
+     <public type="attr" name="thumbTint"/>
+     <public type="attr" name="thumbTintMode"/>
      <public type="attr" name="tickMark"/>
      <public type="attr" name="tickMarkTint"/>
      <public type="attr" name="tickMarkTintMode"/>
      <public type="attr" name="title"/>
+     <public type="attr" name="titleMargin"/>
      <public type="attr" name="titleMarginBottom"/>
      <public type="attr" name="titleMarginEnd"/>
-     <public type="attr" name="titleMargin"/>
      <public type="attr" name="titleMargins"/>
      <public type="attr" name="titleMarginStart"/>
      <public type="attr" name="titleMarginTop"/>
@@ -204,6 +207,8 @@
      <public type="attr" name="toolbarNavigationButtonStyle"/>
      <public type="attr" name="toolbarStyle"/>
      <public type="attr" name="track"/>
+     <public type="attr" name="trackTint"/>
+     <public type="attr" name="trackTintMode"/>
      <public type="attr" name="voiceIcon"/>
      <public type="attr" name="windowActionBar"/>
      <public type="attr" name="windowActionBarOverlay"/>
diff --git a/current/support/v7/appcompat/res-public/values/public_styles.xml b/current/support/v7/appcompat/res-public/values/public_styles.xml
index 38efc46..a9956ad 100644
--- a/current/support/v7/appcompat/res-public/values/public_styles.xml
+++ b/current/support/v7/appcompat/res-public/values/public_styles.xml
@@ -36,6 +36,12 @@
     <public type="style" name="TextAppearance.AppCompat.Medium"/>
     <public type="style" name="TextAppearance.AppCompat.Medium.Inverse"/>
     <public type="style" name="TextAppearance.AppCompat.Menu"/>
+    <public type="style" name="TextAppearance.AppCompat.Notification"/>
+    <public type="style" name="TextAppearance.AppCompat.Notification.Info"/>
+    <public type="style" name="TextAppearance.AppCompat.Notification.Line2"/>
+    <public type="style" name="TextAppearance.AppCompat.Notification.Media"/>
+    <public type="style" name="TextAppearance.AppCompat.Notification.Time"/>
+    <public type="style" name="TextAppearance.AppCompat.Notification.Title"/>
     <public type="style" name="TextAppearance.AppCompat.SearchResult.Subtitle"/>
     <public type="style" name="TextAppearance.AppCompat.SearchResult.Title"/>
     <public type="style" name="TextAppearance.AppCompat.Small"/>
diff --git a/current/support/v7/appcompat/res/anim/abc_fade_in.xml b/current/support/v7/appcompat/res/anim/abc_fade_in.xml
index da7ee29..ea3e602 100644
--- a/current/support/v7/appcompat/res/anim/abc_fade_in.xml
+++ b/current/support/v7/appcompat/res/anim/abc_fade_in.xml
@@ -17,4 +17,4 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
        android:interpolator="@android:anim/decelerate_interpolator"
        android:fromAlpha="0.0" android:toAlpha="1.0"
-       android:duration="@android:integer/config_mediumAnimTime" />
\ No newline at end of file
+       android:duration="@android:integer/config_mediumAnimTime" />
diff --git a/current/support/v7/appcompat/res/anim/abc_fade_out.xml b/current/support/v7/appcompat/res/anim/abc_fade_out.xml
index c81b39a..40d2d37 100644
--- a/current/support/v7/appcompat/res/anim/abc_fade_out.xml
+++ b/current/support/v7/appcompat/res/anim/abc_fade_out.xml
@@ -17,4 +17,4 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
        android:interpolator="@android:anim/decelerate_interpolator"
        android:fromAlpha="1.0" android:toAlpha="0.0"
-       android:duration="@android:integer/config_mediumAnimTime" />
\ No newline at end of file
+       android:duration="@android:integer/config_mediumAnimTime" />
diff --git a/current/support/v7/appcompat/res/anim/abc_grow_fade_in_from_bottom.xml b/current/support/v7/appcompat/res/anim/abc_grow_fade_in_from_bottom.xml
index 79d02d4..f38b039 100644
--- a/current/support/v7/appcompat/res/anim/abc_grow_fade_in_from_bottom.xml
+++ b/current/support/v7/appcompat/res/anim/abc_grow_fade_in_from_bottom.xml
@@ -27,4 +27,4 @@
     <alpha 	android:interpolator="@android:anim/decelerate_interpolator"
               android:fromAlpha="0.0" android:toAlpha="1.0"
               android:duration="@integer/abc_config_activityShortDur" />
-</set>
\ No newline at end of file
+</set>
diff --git a/current/support/v7/appcompat/res/anim/abc_popup_enter.xml b/current/support/v7/appcompat/res/anim/abc_popup_enter.xml
index 91664da..2036eec 100644
--- a/current/support/v7/appcompat/res/anim/abc_popup_enter.xml
+++ b/current/support/v7/appcompat/res/anim/abc_popup_enter.xml
@@ -18,4 +18,4 @@
     <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
            android:interpolator="@android:anim/decelerate_interpolator"
            android:duration="@integer/abc_config_activityShortDur" />
-</set>
\ No newline at end of file
+</set>
diff --git a/current/support/v7/appcompat/res/anim/abc_popup_exit.xml b/current/support/v7/appcompat/res/anim/abc_popup_exit.xml
index db7e807..9f6a54d 100644
--- a/current/support/v7/appcompat/res/anim/abc_popup_exit.xml
+++ b/current/support/v7/appcompat/res/anim/abc_popup_exit.xml
@@ -18,4 +18,4 @@
     <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
            android:interpolator="@android:anim/decelerate_interpolator"
            android:duration="@integer/abc_config_activityShortDur" />
-</set>
\ No newline at end of file
+</set>
diff --git a/current/support/v7/appcompat/res/anim/abc_shrink_fade_out_from_bottom.xml b/current/support/v7/appcompat/res/anim/abc_shrink_fade_out_from_bottom.xml
index 9a23cd2..09d9769 100644
--- a/current/support/v7/appcompat/res/anim/abc_shrink_fade_out_from_bottom.xml
+++ b/current/support/v7/appcompat/res/anim/abc_shrink_fade_out_from_bottom.xml
@@ -24,4 +24,4 @@
     <alpha 	android:interpolator="@android:anim/decelerate_interpolator"
               android:fromAlpha="1.0" android:toAlpha="0.0"
               android:duration="@integer/abc_config_activityShortDur" />
-</set>
\ No newline at end of file
+</set>
diff --git a/current/support/v7/appcompat/res/anim/abc_slide_in_top.xml b/current/support/v7/appcompat/res/anim/abc_slide_in_top.xml
index ab824f2..e6bd8bb 100644
--- a/current/support/v7/appcompat/res/anim/abc_slide_in_top.xml
+++ b/current/support/v7/appcompat/res/anim/abc_slide_in_top.xml
@@ -16,4 +16,4 @@
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
            android:interpolator="@android:anim/decelerate_interpolator"
            android:fromYDelta="-50%p" android:toYDelta="0"
-           android:duration="@android:integer/config_mediumAnimTime"/>
\ No newline at end of file
+           android:duration="@android:integer/config_mediumAnimTime"/>
diff --git a/current/support/v7/appcompat/res/anim/abc_slide_out_bottom.xml b/current/support/v7/appcompat/res/anim/abc_slide_out_bottom.xml
index b309fe8..9b13d3b 100644
--- a/current/support/v7/appcompat/res/anim/abc_slide_out_bottom.xml
+++ b/current/support/v7/appcompat/res/anim/abc_slide_out_bottom.xml
@@ -16,4 +16,4 @@
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
            android:interpolator="@android:anim/accelerate_interpolator"
            android:fromYDelta="0" android:toYDelta="50%p"
-           android:duration="@android:integer/config_mediumAnimTime"/>
\ No newline at end of file
+           android:duration="@android:integer/config_mediumAnimTime"/>
diff --git a/current/support/v7/appcompat/res/anim/abc_slide_out_top.xml b/current/support/v7/appcompat/res/anim/abc_slide_out_top.xml
index e84d1c7..980f826 100644
--- a/current/support/v7/appcompat/res/anim/abc_slide_out_top.xml
+++ b/current/support/v7/appcompat/res/anim/abc_slide_out_top.xml
@@ -16,4 +16,4 @@
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
            android:interpolator="@android:anim/accelerate_interpolator"
            android:fromYDelta="0" android:toYDelta="-50%p"
-           android:duration="@android:integer/config_mediumAnimTime"/>
\ No newline at end of file
+           android:duration="@android:integer/config_mediumAnimTime"/>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_btn_colored_borderless_text_material.xml b/current/support/v7/appcompat/res/color-v23/abc_btn_colored_borderless_text_material.xml
index 468b155..7af3379 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_btn_colored_borderless_text_material.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_btn_colored_borderless_text_material.xml
@@ -18,4 +18,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?android:attr/textColorSecondary" android:alpha="?android:attr/disabledAlpha"/>
     <item android:color="?attr/colorAccent"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_btn_colored_text_material.xml b/current/support/v7/appcompat/res/color-v23/abc_btn_colored_text_material.xml
index 74170d6..21fcf6f 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_btn_colored_text_material.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_btn_colored_text_material.xml
@@ -20,4 +20,4 @@
           android:alpha="?android:attr/disabledAlpha"
           android:color="?android:attr/textColorPrimary" />
     <item android:color="?android:attr/textColorPrimaryInverse" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_color_highlight_material.xml b/current/support/v7/appcompat/res/color-v23/abc_color_highlight_material.xml
index 8d53611..a79aa44 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_color_highlight_material.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_color_highlight_material.xml
@@ -20,4 +20,4 @@
           android:alpha="@dimen/highlight_alpha_material_colored"
           android:color="?android:attr/colorControlActivated" />
     <item android:color="?android:attr/colorControlHighlight" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_tint_btn_checkable.xml b/current/support/v7/appcompat/res/color-v23/abc_tint_btn_checkable.xml
index e82eff4..7180b4c 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_tint_btn_checkable.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_tint_btn_checkable.xml
@@ -18,4 +18,4 @@
     <item android:state_enabled="false" android:color="?attr/colorControlNormal" android:alpha="?android:disabledAlpha"/>
     <item android:state_checked="true" android:color="?attr/colorControlActivated"/>
     <item android:color="?attr/colorControlNormal"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_tint_default.xml b/current/support/v7/appcompat/res/color-v23/abc_tint_default.xml
index abe3880..0f0c00c 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_tint_default.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_tint_default.xml
@@ -22,4 +22,4 @@
     <item android:state_selected="true" android:color="?attr/colorControlActivated"/>
     <item android:state_checked="true" android:color="?attr/colorControlActivated"/>
     <item android:color="?attr/colorControlNormal"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_tint_edittext.xml b/current/support/v7/appcompat/res/color-v23/abc_tint_edittext.xml
index 0e05e07..0d3de4a 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_tint_edittext.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_tint_edittext.xml
@@ -18,4 +18,4 @@
     <item android:state_enabled="false" android:color="?attr/colorControlNormal" android:alpha="?android:disabledAlpha"/>
     <item android:state_pressed="false" android:state_focused="false" android:color="?attr/colorControlNormal"/>
     <item android:color="?attr/colorControlActivated"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_tint_seek_thumb.xml b/current/support/v7/appcompat/res/color-v23/abc_tint_seek_thumb.xml
index 4fc9626..e12a250 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_tint_seek_thumb.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_tint_seek_thumb.xml
@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?attr/colorControlActivated" android:alpha="?android:attr/disabledAlpha"/>
     <item android:color="?attr/colorControlActivated"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_tint_spinner.xml b/current/support/v7/appcompat/res/color-v23/abc_tint_spinner.xml
index 0e05e07..0d3de4a 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_tint_spinner.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_tint_spinner.xml
@@ -18,4 +18,4 @@
     <item android:state_enabled="false" android:color="?attr/colorControlNormal" android:alpha="?android:disabledAlpha"/>
     <item android:state_pressed="false" android:state_focused="false" android:color="?attr/colorControlNormal"/>
     <item android:color="?attr/colorControlActivated"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_tint_switch_thumb.xml b/current/support/v7/appcompat/res/color-v23/abc_tint_switch_thumb.xml
index f589fdf..d93aef3 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_tint_switch_thumb.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_tint_switch_thumb.xml
@@ -18,4 +18,4 @@
     <item android:state_enabled="false" android:color="?attr/colorSwitchThumbNormal" android:alpha="?android:attr/disabledAlpha"/>
     <item android:state_checked="true" android:color="?attr/colorControlActivated"/>
     <item android:color="?attr/colorSwitchThumbNormal"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color-v23/abc_tint_switch_track.xml b/current/support/v7/appcompat/res/color-v23/abc_tint_switch_track.xml
index e663772..6c7272c 100644
--- a/current/support/v7/appcompat/res/color-v23/abc_tint_switch_track.xml
+++ b/current/support/v7/appcompat/res/color-v23/abc_tint_switch_track.xml
@@ -18,4 +18,4 @@
     <item android:state_enabled="false" android:color="?android:attr/colorForeground" android:alpha="0.1"/>
     <item android:state_checked="true" android:color="?attr/colorControlActivated" android:alpha="0.3"/>
     <item android:color="?android:attr/colorForeground" android:alpha="0.3"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_btn_colored_borderless_text_material.xml b/current/support/v7/appcompat/res/color/abc_btn_colored_borderless_text_material.xml
index 1480046..a278faf 100644
--- a/current/support/v7/appcompat/res/color/abc_btn_colored_borderless_text_material.xml
+++ b/current/support/v7/appcompat/res/color/abc_btn_colored_borderless_text_material.xml
@@ -21,4 +21,4 @@
           app:alpha="?android:attr/disabledAlpha"
           android:color="?android:attr/textColorSecondary"/>
     <item android:color="?attr/colorAccent"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_btn_colored_text_material.xml b/current/support/v7/appcompat/res/color/abc_btn_colored_text_material.xml
index 897a3f7..d5142f8 100644
--- a/current/support/v7/appcompat/res/color/abc_btn_colored_text_material.xml
+++ b/current/support/v7/appcompat/res/color/abc_btn_colored_text_material.xml
@@ -21,4 +21,4 @@
           app:alpha="?android:attr/disabledAlpha"
           android:color="?android:attr/textColorPrimary" />
     <item android:color="?android:attr/textColorPrimaryInverse" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_search_url_text.xml b/current/support/v7/appcompat/res/color/abc_search_url_text.xml
index 0631d5d..26a973c 100644
--- a/current/support/v7/appcompat/res/color/abc_search_url_text.xml
+++ b/current/support/v7/appcompat/res/color/abc_search_url_text.xml
@@ -18,4 +18,4 @@
     <item android:state_pressed="true" android:color="@color/abc_search_url_text_pressed"/>
     <item android:state_selected="true" android:color="@color/abc_search_url_text_selected"/>
     <item android:color="@color/abc_search_url_text_normal"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_tint_btn_checkable.xml b/current/support/v7/appcompat/res/color/abc_tint_btn_checkable.xml
index 0c663f6..6095c06 100644
--- a/current/support/v7/appcompat/res/color/abc_tint_btn_checkable.xml
+++ b/current/support/v7/appcompat/res/color/abc_tint_btn_checkable.xml
@@ -19,4 +19,4 @@
     <item android:state_enabled="false" android:color="?attr/colorControlNormal" app:alpha="?android:disabledAlpha"/>
     <item android:state_checked="true" android:color="?attr/colorControlActivated"/>
     <item android:color="?attr/colorControlNormal"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_tint_default.xml b/current/support/v7/appcompat/res/color/abc_tint_default.xml
index 8d7c391..0d73016 100644
--- a/current/support/v7/appcompat/res/color/abc_tint_default.xml
+++ b/current/support/v7/appcompat/res/color/abc_tint_default.xml
@@ -23,4 +23,4 @@
     <item android:state_selected="true" android:color="?attr/colorControlActivated"/>
     <item android:state_checked="true" android:color="?attr/colorControlActivated"/>
     <item android:color="?attr/colorControlNormal"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_tint_edittext.xml b/current/support/v7/appcompat/res/color/abc_tint_edittext.xml
index 536d77f..0f27a0b 100644
--- a/current/support/v7/appcompat/res/color/abc_tint_edittext.xml
+++ b/current/support/v7/appcompat/res/color/abc_tint_edittext.xml
@@ -21,4 +21,4 @@
     <item android:state_pressed="false" android:state_focused="false"
           android:color="?attr/colorControlNormal"/>
     <item android:color="?attr/colorControlActivated"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_tint_seek_thumb.xml b/current/support/v7/appcompat/res/color/abc_tint_seek_thumb.xml
index cb53788..7617e3f 100644
--- a/current/support/v7/appcompat/res/color/abc_tint_seek_thumb.xml
+++ b/current/support/v7/appcompat/res/color/abc_tint_seek_thumb.xml
@@ -18,4 +18,4 @@
           xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:state_enabled="false" android:color="?attr/colorControlActivated" app:alpha="?android:attr/disabledAlpha"/>
     <item android:color="?attr/colorControlActivated"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_tint_spinner.xml b/current/support/v7/appcompat/res/color/abc_tint_spinner.xml
index 44333dd..1f4693d 100644
--- a/current/support/v7/appcompat/res/color/abc_tint_spinner.xml
+++ b/current/support/v7/appcompat/res/color/abc_tint_spinner.xml
@@ -19,4 +19,4 @@
     <item android:state_enabled="false" android:color="?attr/colorControlNormal" app:alpha="?android:disabledAlpha"/>
     <item android:state_pressed="false" android:state_focused="false" android:color="?attr/colorControlNormal"/>
     <item android:color="?attr/colorControlActivated"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_tint_switch_thumb.xml b/current/support/v7/appcompat/res/color/abc_tint_switch_thumb.xml
index fc8bd24..a3d42df 100644
--- a/current/support/v7/appcompat/res/color/abc_tint_switch_thumb.xml
+++ b/current/support/v7/appcompat/res/color/abc_tint_switch_thumb.xml
@@ -19,4 +19,4 @@
     <item android:state_enabled="false" android:color="?attr/colorSwitchThumbNormal" app:alpha="?android:attr/disabledAlpha"/>
     <item android:state_checked="true" android:color="?attr/colorControlActivated"/>
     <item android:color="?attr/colorSwitchThumbNormal"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/abc_tint_switch_track.xml b/current/support/v7/appcompat/res/color/abc_tint_switch_track.xml
index 22322f8..ee4cb1c 100644
--- a/current/support/v7/appcompat/res/color/abc_tint_switch_track.xml
+++ b/current/support/v7/appcompat/res/color/abc_tint_switch_track.xml
@@ -19,4 +19,4 @@
     <item android:state_enabled="false" android:color="?android:attr/colorForeground" app:alpha="0.1"/>
     <item android:state_checked="true" android:color="?attr/colorControlActivated" app:alpha="0.3"/>
     <item android:color="?android:attr/colorForeground" app:alpha="0.3"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/switch_thumb_material_dark.xml b/current/support/v7/appcompat/res/color/switch_thumb_material_dark.xml
index 6153382..8fede70 100644
--- a/current/support/v7/appcompat/res/color/switch_thumb_material_dark.xml
+++ b/current/support/v7/appcompat/res/color/switch_thumb_material_dark.xml
@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_dark"/>
     <item android:color="@color/switch_thumb_normal_material_dark"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/color/switch_thumb_material_light.xml b/current/support/v7/appcompat/res/color/switch_thumb_material_light.xml
index 94d7114..1a34b74 100644
--- a/current/support/v7/appcompat/res/color/switch_thumb_material_light.xml
+++ b/current/support/v7/appcompat/res/color/switch_thumb_material_light.xml
@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_light"/>
     <item android:color="@color/switch_thumb_normal_material_light"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml b/current/support/v7/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml
index 595c56c..025e8df 100644
--- a/current/support/v7/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml
+++ b/current/support/v7/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml
@@ -15,4 +15,4 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?android:attr/colorControlHighlight"/>
\ No newline at end of file
+        android:color="?android:attr/colorControlHighlight"/>
diff --git a/current/support/v7/appcompat/res/drawable-v21/abc_btn_colored_material.xml b/current/support/v7/appcompat/res/drawable-v21/abc_btn_colored_material.xml
index 10251aa..0f87c09 100644
--- a/current/support/v7/appcompat/res/drawable-v21/abc_btn_colored_material.xml
+++ b/current/support/v7/appcompat/res/drawable-v21/abc_btn_colored_material.xml
@@ -47,4 +47,4 @@
             </selector>
         </item>
     </ripple>
-</inset>
\ No newline at end of file
+</inset>
diff --git a/current/support/v7/appcompat/res/drawable-v21/abc_edit_text_material.xml b/current/support/v7/appcompat/res/drawable-v21/abc_edit_text_material.xml
index d98b008..9861e37 100644
--- a/current/support/v7/appcompat/res/drawable-v21/abc_edit_text_material.xml
+++ b/current/support/v7/appcompat/res/drawable-v21/abc_edit_text_material.xml
@@ -34,4 +34,4 @@
                         android:tint="?attr/colorControlActivated"/>
         </item>
     </selector>
-</inset>
\ No newline at end of file
+</inset>
diff --git a/current/support/v7/appcompat/res/drawable-v21/notification_action_background.xml b/current/support/v7/appcompat/res/drawable-v21/notification_action_background.xml
index 852c3f0..2183c1b 100644
--- a/current/support/v7/appcompat/res/drawable-v21/notification_action_background.xml
+++ b/current/support/v7/appcompat/res/drawable-v21/notification_action_background.xml
@@ -19,4 +19,4 @@
     android:color="@color/ripple_material_light">
     <item android:id="@android:id/mask"
         android:drawable="@drawable/abc_btn_default_mtrl_shape" />
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/current/support/v7/appcompat/res/drawable-v23/abc_control_background_material.xml b/current/support/v7/appcompat/res/drawable-v23/abc_control_background_material.xml
index 0b54039..a837ac6 100644
--- a/current/support/v7/appcompat/res/drawable-v23/abc_control_background_material.xml
+++ b/current/support/v7/appcompat/res/drawable-v23/abc_control_background_material.xml
@@ -16,4 +16,4 @@
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
         android:color="@color/abc_color_highlight_material"
-        android:radius="20dp" />
\ No newline at end of file
+        android:radius="20dp" />
diff --git a/current/support/v7/appcompat/res/drawable/abc_btn_radio_material.xml b/current/support/v7/appcompat/res/drawable/abc_btn_radio_material.xml
index 6e9f9cf..09d930e 100644
--- a/current/support/v7/appcompat/res/drawable/abc_btn_radio_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_btn_radio_material.xml
@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:drawable="@drawable/abc_btn_radio_to_on_mtrl_015" />
     <item android:drawable="@drawable/abc_btn_radio_to_on_mtrl_000" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/drawable/abc_cab_background_internal_bg.xml b/current/support/v7/appcompat/res/drawable/abc_cab_background_internal_bg.xml
index 9faf60a..45c4d9f 100644
--- a/current/support/v7/appcompat/res/drawable/abc_cab_background_internal_bg.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_cab_background_internal_bg.xml
@@ -20,4 +20,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <solid android:color="@android:color/white" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/v7/appcompat/res/drawable/abc_dialog_material_background.xml b/current/support/v7/appcompat/res/drawable/abc_dialog_material_background.xml
index 18560fc..5bffdec 100644
--- a/current/support/v7/appcompat/res/drawable/abc_dialog_material_background.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_dialog_material_background.xml
@@ -23,4 +23,4 @@
         <corners android:radius="2dp" />
         <solid android:color="@android:color/white" />
     </shape>
-</inset>
\ No newline at end of file
+</inset>
diff --git a/current/support/v7/appcompat/res/drawable/abc_ic_ab_back_material.xml b/current/support/v7/appcompat/res/drawable/abc_ic_ab_back_material.xml
index 5a89523..026ac9e 100644
--- a/current/support/v7/appcompat/res/drawable/abc_ic_ab_back_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_ic_ab_back_material.xml
@@ -24,4 +24,4 @@
     <path
             android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"
             android:fillColor="@android:color/white"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/current/support/v7/appcompat/res/drawable/abc_ic_arrow_drop_right_black_24dp.xml b/current/support/v7/appcompat/res/drawable/abc_ic_arrow_drop_right_black_24dp.xml
index 68547eb..99c5b98 100644
--- a/current/support/v7/appcompat/res/drawable/abc_ic_arrow_drop_right_black_24dp.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_ic_arrow_drop_right_black_24dp.xml
@@ -30,4 +30,4 @@
         <path android:fillColor="@android:color/black" android:pathData="M7,14 L12,9 L17,14 L7,14 Z" />
         <path android:pathData="M0,0 L24,0 L24,24 L0,24 L0,0 Z" />
     </group>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/current/support/v7/appcompat/res/drawable/abc_ic_menu_overflow_material.xml b/current/support/v7/appcompat/res/drawable/abc_ic_menu_overflow_material.xml
index 1420edd..34e8215 100644
--- a/current/support/v7/appcompat/res/drawable/abc_ic_menu_overflow_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_ic_menu_overflow_material.xml
@@ -23,4 +23,4 @@
     <path
             android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z"
             android:fillColor="@android:color/white"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/current/support/v7/appcompat/res/drawable/abc_seekbar_thumb_material.xml b/current/support/v7/appcompat/res/drawable/abc_seekbar_thumb_material.xml
index 7fea83b..091d1e5 100644
--- a/current/support/v7/appcompat/res/drawable/abc_seekbar_thumb_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_seekbar_thumb_material.xml
@@ -32,4 +32,4 @@
         <bitmap android:src="@drawable/abc_scrubber_control_to_pressed_mtrl_000"
                 android:gravity="center"/>
     </item>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/drawable/abc_seekbar_tick_mark_material.xml b/current/support/v7/appcompat/res/drawable/abc_seekbar_tick_mark_material.xml
index e2d86c9..a4a4dda 100644
--- a/current/support/v7/appcompat/res/drawable/abc_seekbar_tick_mark_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_seekbar_tick_mark_material.xml
@@ -19,4 +19,4 @@
     <size android:width="@dimen/abc_progress_bar_height_material"
           android:height="@dimen/abc_progress_bar_height_material"/>
     <solid android:color="@android:color/white"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/v7/appcompat/res/drawable/abc_seekbar_track_material.xml b/current/support/v7/appcompat/res/drawable/abc_seekbar_track_material.xml
index e68ac03..d9030d5 100644
--- a/current/support/v7/appcompat/res/drawable/abc_seekbar_track_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_seekbar_track_material.xml
@@ -37,4 +37,4 @@
             </selector>
         </scale>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/current/support/v7/appcompat/res/drawable/abc_spinner_textfield_background_material.xml b/current/support/v7/appcompat/res/drawable/abc_spinner_textfield_background_material.xml
index d0f46a8..e5de811 100644
--- a/current/support/v7/appcompat/res/drawable/abc_spinner_textfield_background_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_spinner_textfield_background_material.xml
@@ -33,4 +33,4 @@
             </layer-list>
         </item>
     </selector>
-</inset>
\ No newline at end of file
+</inset>
diff --git a/current/support/v7/appcompat/res/drawable/abc_switch_thumb_material.xml b/current/support/v7/appcompat/res/drawable/abc_switch_thumb_material.xml
index ee96ec2..71ff2e5 100644
--- a/current/support/v7/appcompat/res/drawable/abc_switch_thumb_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_switch_thumb_material.xml
@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:drawable="@drawable/abc_btn_switch_to_on_mtrl_00012" />
     <item android:drawable="@drawable/abc_btn_switch_to_on_mtrl_00001" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/drawable/abc_text_cursor_material.xml b/current/support/v7/appcompat/res/drawable/abc_text_cursor_material.xml
index 885670c..c4f9936 100644
--- a/current/support/v7/appcompat/res/drawable/abc_text_cursor_material.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_text_cursor_material.xml
@@ -20,4 +20,4 @@
     <size android:height="2dp"
           android:width="2dp"/>
     <solid android:color="@android:color/white"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/v7/appcompat/res/drawable/abc_vector_test.xml b/current/support/v7/appcompat/res/drawable/abc_vector_test.xml
index d5da2cb..480d8bb 100644
--- a/current/support/v7/appcompat/res/drawable/abc_vector_test.xml
+++ b/current/support/v7/appcompat/res/drawable/abc_vector_test.xml
@@ -22,4 +22,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/current/support/v7/appcompat/res/drawable/notification_bg.xml b/current/support/v7/appcompat/res/drawable/notification_bg.xml
index 1232b4c..9e99db9 100644
--- a/current/support/v7/appcompat/res/drawable/notification_bg.xml
+++ b/current/support/v7/appcompat/res/drawable/notification_bg.xml
@@ -21,4 +21,4 @@
     <item android:state_pressed="true"
         android:drawable="@drawable/notification_bg_normal_pressed" />
     <item android:state_pressed="false" android:drawable="@drawable/notification_bg_normal" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/drawable/notification_bg_low.xml b/current/support/v7/appcompat/res/drawable/notification_bg_low.xml
index 72e58ae..dc0b907 100644
--- a/current/support/v7/appcompat/res/drawable/notification_bg_low.xml
+++ b/current/support/v7/appcompat/res/drawable/notification_bg_low.xml
@@ -20,4 +20,4 @@
 
     <item android:state_pressed="true"  android:drawable="@drawable/notification_bg_low_pressed" />
     <item android:state_pressed="false" android:drawable="@drawable/notification_bg_low_normal" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/current/support/v7/appcompat/res/drawable/notification_icon_background.xml b/current/support/v7/appcompat/res/drawable/notification_icon_background.xml
index 490a797..a38262f 100644
--- a/current/support/v7/appcompat/res/drawable/notification_icon_background.xml
+++ b/current/support/v7/appcompat/res/drawable/notification_icon_background.xml
@@ -19,4 +19,4 @@
     android:shape="oval">
     <solid
         android:color="@color/notification_icon_bg_color"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/v7/appcompat/res/drawable/notification_tile_bg.xml b/current/support/v7/appcompat/res/drawable/notification_tile_bg.xml
index 8eee7ef..1338f9b 100644
--- a/current/support/v7/appcompat/res/drawable/notification_tile_bg.xml
+++ b/current/support/v7/appcompat/res/drawable/notification_tile_bg.xml
@@ -19,4 +19,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:tileMode="repeat"
     android:src="@drawable/notify_panel_notification_icon_bg"
-/>
\ No newline at end of file
+/>
diff --git a/current/support/v7/appcompat/res/layout/notification_media_action.xml b/current/support/v7/appcompat/res/layout-v11/notification_media_action.xml
similarity index 99%
rename from current/support/v7/appcompat/res/layout/notification_media_action.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_media_action.xml
index d546792..448a64c 100644
--- a/current/support/v7/appcompat/res/layout/notification_media_action.xml
+++ b/current/support/v7/appcompat/res/layout-v11/notification_media_action.xml
@@ -22,4 +22,4 @@
     android:layout_marginLeft="2dp"
     android:layout_marginRight="2dp"
     android:layout_weight="1"
-    android:gravity="center"/>
\ No newline at end of file
+    android:gravity="center"/>
diff --git a/current/support/v7/appcompat/res/layout/notification_media_cancel_action.xml b/current/support/v7/appcompat/res/layout-v11/notification_media_cancel_action.xml
similarity index 99%
rename from current/support/v7/appcompat/res/layout/notification_media_cancel_action.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_media_cancel_action.xml
index c2bd8c2..491b8b6 100644
--- a/current/support/v7/appcompat/res/layout/notification_media_cancel_action.xml
+++ b/current/support/v7/appcompat/res/layout-v11/notification_media_cancel_action.xml
@@ -26,4 +26,4 @@
     android:layout_weight="1"
     android:src="@android:drawable/ic_menu_close_clear_cancel"
     android:gravity="center"
-    android:visibility="gone"/>
\ No newline at end of file
+    android:visibility="gone"/>
diff --git a/current/support/v7/appcompat/res/layout/notification_template_big_media.xml b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media.xml
similarity index 100%
rename from current/support/v7/appcompat/res/layout/notification_template_big_media.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_template_big_media.xml
diff --git a/current/support/v7/appcompat/res/layout/notification_template_big_media_custom.xml b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_custom.xml
similarity index 100%
rename from current/support/v7/appcompat/res/layout/notification_template_big_media_custom.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_template_big_media_custom.xml
diff --git a/current/support/v7/appcompat/res/layout/notification_template_big_media_narrow.xml b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow.xml
similarity index 100%
rename from current/support/v7/appcompat/res/layout/notification_template_big_media_narrow.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow.xml
diff --git a/current/support/v7/appcompat/res/layout/notification_template_big_media_narrow_custom.xml b/current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow_custom.xml
similarity index 100%
rename from current/support/v7/appcompat/res/layout/notification_template_big_media_narrow_custom.xml
rename to current/support/v7/appcompat/res/layout-v11/notification_template_big_media_narrow_custom.xml
diff --git a/current/support/v7/appcompat/res/layout-v16/notification_template_custom_big.xml b/current/support/v7/appcompat/res/layout-v16/notification_template_custom_big.xml
index 24c3323..1819e27 100644
--- a/current/support/v7/appcompat/res/layout-v16/notification_template_custom_big.xml
+++ b/current/support/v7/appcompat/res/layout-v16/notification_template_custom_big.xml
@@ -114,4 +114,4 @@
             <!-- actions will be added here -->
         </LinearLayout>
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/current/support/v7/appcompat/res/layout-v21/notification_action.xml b/current/support/v7/appcompat/res/layout-v21/notification_action.xml
index c60bf7d..5c6f10b 100644
--- a/current/support/v7/appcompat/res/layout-v21/notification_action.xml
+++ b/current/support/v7/appcompat/res/layout-v21/notification_action.xml
@@ -38,4 +38,4 @@
         android:singleLine="true"
         android:ellipsize="end"
         android:clickable="false"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout-v21/notification_action_tombstone.xml b/current/support/v7/appcompat/res/layout-v21/notification_action_tombstone.xml
index 1637c6f..d252556 100644
--- a/current/support/v7/appcompat/res/layout-v21/notification_action_tombstone.xml
+++ b/current/support/v7/appcompat/res/layout-v21/notification_action_tombstone.xml
@@ -45,4 +45,4 @@
         android:clickable="false"
         android:enabled="false"
         android:alpha="0.5"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout-v21/notification_template_custom_big.xml b/current/support/v7/appcompat/res/layout-v21/notification_template_custom_big.xml
index 38332bd..836af29 100644
--- a/current/support/v7/appcompat/res/layout-v21/notification_template_custom_big.xml
+++ b/current/support/v7/appcompat/res/layout-v21/notification_template_custom_big.xml
@@ -87,4 +87,4 @@
             <!-- actions will be added here -->
         </LinearLayout>
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/current/support/v7/appcompat/res/layout/abc_action_bar_view_list_nav_layout.xml b/current/support/v7/appcompat/res/layout/abc_action_bar_view_list_nav_layout.xml
index 5c105ab..72baf04 100644
--- a/current/support/v7/appcompat/res/layout/abc_action_bar_view_list_nav_layout.xml
+++ b/current/support/v7/appcompat/res/layout/abc_action_bar_view_list_nav_layout.xml
@@ -20,4 +20,4 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               style="?attr/actionBarTabBarStyle">
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout/abc_action_mode_close_item_material.xml b/current/support/v7/appcompat/res/layout/abc_action_mode_close_item_material.xml
index b3babb2..fa5733d 100644
--- a/current/support/v7/appcompat/res/layout/abc_action_mode_close_item_material.xml
+++ b/current/support/v7/appcompat/res/layout/abc_action_mode_close_item_material.xml
@@ -24,4 +24,4 @@
         app:srcCompat="?attr/actionModeCloseDrawable"
         style="?attr/actionModeCloseButtonStyle"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"/>
\ No newline at end of file
+        android:layout_height="match_parent"/>
diff --git a/current/support/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml b/current/support/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml
index 887427d..a239a42 100644
--- a/current/support/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml
+++ b/current/support/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml
@@ -49,4 +49,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout/abc_alert_dialog_button_bar_material.xml b/current/support/v7/appcompat/res/layout/abc_alert_dialog_button_bar_material.xml
index 08adfd1..02d687b 100644
--- a/current/support/v7/appcompat/res/layout/abc_alert_dialog_button_bar_material.xml
+++ b/current/support/v7/appcompat/res/layout/abc_alert_dialog_button_bar_material.xml
@@ -15,44 +15,50 @@
      limitations under the License.
 -->
 
-<android.support.v7.widget.ButtonBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/buttonPanel"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layoutDirection="locale"
-    android:orientation="horizontal"
-    android:paddingLeft="12dp"
-    android:paddingRight="12dp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:gravity="bottom"
-    style="?attr/buttonBarStyle">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/buttonPanel"
+            style="?attr/buttonBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fillViewport="true"
+            android:scrollIndicators="top|bottom">
 
-    <Button
-        android:id="@android:id/button3"
-        style="?attr/buttonBarNeutralButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <android.support.v7.widget.ButtonBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        android:layoutDirection="locale"
+        android:orientation="horizontal"
+        android:paddingBottom="4dp"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:paddingTop="4dp">
 
-    <android.support.v4.widget.Space
-        android:id="@+id/spacer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:visibility="invisible" />
+        <Button
+            android:id="@android:id/button3"
+            style="?attr/buttonBarNeutralButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-    <Button
-        android:id="@android:id/button2"
-        style="?attr/buttonBarNegativeButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        <android.support.v4.widget.Space
+            android:id="@+id/spacer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:visibility="invisible"/>
 
-    <Button
-        android:id="@android:id/button1"
-        style="?attr/buttonBarPositiveButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        <Button
+            android:id="@android:id/button2"
+            style="?attr/buttonBarNegativeButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-</android.support.v7.widget.ButtonBarLayout>
+        <Button
+            android:id="@android:id/button1"
+            style="?attr/buttonBarPositiveButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </android.support.v7.widget.ButtonBarLayout>
+
+</ScrollView>
diff --git a/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml b/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml
index 3237533..1962d48 100644
--- a/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml
+++ b/current/support/v7/appcompat/res/layout/abc_alert_dialog_material.xml
@@ -15,113 +15,85 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/parentPanel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+<android.support.v7.widget.AlertDialogLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/parentPanel"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="start|left|top"
+    android:orientation="vertical">
 
-    <LinearLayout
-            android:id="@+id/topPanel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        <LinearLayout
-                android:id="@+id/title_template"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:paddingLeft="?attr/dialogPreferredPadding"
-                android:paddingRight="?attr/dialogPreferredPadding"
-                android:paddingTop="@dimen/abc_dialog_padding_top_material">
-
-            <ImageView
-                    android:id="@android:id/icon"
-                    android:layout_width="32dip"
-                    android:layout_height="32dip"
-                    android:scaleType="fitCenter"
-                    android:src="@null"
-                    style="@style/RtlOverlay.Widget.AppCompat.DialogTitle.Icon"/>
-
-            <android.support.v7.widget.DialogTitle
-                    android:id="@+id/alertTitle"
-                    style="?attr/android:windowTitleStyle"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="viewStart" />
-
-        </LinearLayout>
-        <!-- If the client uses a customTitle, it will be added here. -->
-    </LinearLayout>
+    <include layout="@layout/abc_alert_dialog_title_material"/>
 
     <FrameLayout
-            android:id="@+id/contentPanel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:minHeight="48dp">
+        android:id="@+id/contentPanel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp">
 
         <View android:id="@+id/scrollIndicatorUp"
-              android:visibility="gone"
               android:layout_width="match_parent"
               android:layout_height="1dp"
               android:layout_gravity="top"
-              android:background="?attr/colorControlHighlight"/>
+              android:background="?attr/colorControlHighlight"
+              android:visibility="gone"/>
 
         <android.support.v4.widget.NestedScrollView
-                android:id="@+id/scrollView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clipToPadding="false">
+            android:id="@+id/scrollView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false">
 
             <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <android.support.v4.widget.Space
+                    android:id="@+id/textSpacerNoTitle"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_height="@dimen/abc_dialog_padding_top_material"
+                    android:visibility="gone"/>
 
                 <TextView
-                        android:id="@android:id/message"
-                        style="@style/TextAppearance.AppCompat.Subhead"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="?attr/dialogPreferredPadding"
-                        android:paddingTop="@dimen/abc_dialog_padding_top_material"
-                        android:paddingRight="?attr/dialogPreferredPadding"/>
+                    android:id="@android:id/message"
+                    style="@style/TextAppearance.AppCompat.Subhead"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="?attr/dialogPreferredPadding"
+                    android:paddingRight="?attr/dialogPreferredPadding"/>
 
-                <View
-                        android:id="@+id/textSpacerNoButtons"
-                        android:visibility="gone"
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/abc_dialog_padding_top_material"/>
+                <android.support.v4.widget.Space
+                    android:id="@+id/textSpacerNoButtons"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/abc_dialog_padding_top_material"
+                    android:visibility="gone"/>
             </LinearLayout>
         </android.support.v4.widget.NestedScrollView>
 
         <View android:id="@+id/scrollIndicatorDown"
-              android:visibility="gone"
               android:layout_width="match_parent"
               android:layout_height="1dp"
               android:layout_gravity="bottom"
-              android:background="?attr/colorControlHighlight"/>
+              android:background="?attr/colorControlHighlight"
+              android:visibility="gone"/>
 
     </FrameLayout>
 
     <FrameLayout
-            android:id="@+id/customPanel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:minHeight="48dp">
+        android:id="@+id/customPanel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp">
 
         <FrameLayout
-                android:id="@+id/custom"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            android:id="@+id/custom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
     </FrameLayout>
 
-    <include layout="@layout/abc_alert_dialog_button_bar_material" />
+    <include layout="@layout/abc_alert_dialog_button_bar_material"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"/>
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v7.widget.AlertDialogLayout>
diff --git a/current/support/v7/appcompat/res/layout/abc_alert_dialog_title_material.xml b/current/support/v7/appcompat/res/layout/abc_alert_dialog_title_material.xml
new file mode 100644
index 0000000..0b8b14e
--- /dev/null
+++ b/current/support/v7/appcompat/res/layout/abc_alert_dialog_title_material.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/topPanel"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+    <!-- If the client uses a customTitle, it will be added here. -->
+
+    <LinearLayout
+        android:id="@+id/title_template"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical|start|left"
+        android:orientation="horizontal"
+        android:paddingLeft="?attr/dialogPreferredPadding"
+        android:paddingRight="?attr/dialogPreferredPadding"
+        android:paddingTop="@dimen/abc_dialog_padding_top_material">
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:layout_marginEnd="8dip"
+            android:layout_marginRight="8dip"
+            android:scaleType="fitCenter"
+            android:src="@null"/>
+
+        <android.support.v7.widget.DialogTitle
+            android:id="@+id/alertTitle"
+            style="?android:attr/windowTitleStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAlignment="viewStart"/>
+
+    </LinearLayout>
+
+    <android.support.v4.widget.Space
+        android:id="@+id/titleDividerNoCustom"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/abc_dialog_title_divider_material"
+        android:visibility="gone"/>
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout/abc_dialog_title_material.xml b/current/support/v7/appcompat/res/layout/abc_dialog_title_material.xml
index 1ea20c5..3136332 100644
--- a/current/support/v7/appcompat/res/layout/abc_dialog_title_material.xml
+++ b/current/support/v7/appcompat/res/layout/abc_dialog_title_material.xml
@@ -44,4 +44,4 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"/>
 
-</android.support.v7.widget.FitWindowsLinearLayout>
\ No newline at end of file
+</android.support.v7.widget.FitWindowsLinearLayout>
diff --git a/current/support/v7/appcompat/res/layout/abc_popup_menu_header_item_layout.xml b/current/support/v7/appcompat/res/layout/abc_popup_menu_header_item_layout.xml
index a40b6dd..205cb8a 100644
--- a/current/support/v7/appcompat/res/layout/abc_popup_menu_header_item_layout.xml
+++ b/current/support/v7/appcompat/res/layout/abc_popup_menu_header_item_layout.xml
@@ -32,4 +32,4 @@
             android:fadingEdge="horizontal"
             android:textAlignment="viewStart" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/current/support/v7/appcompat/res/layout/abc_screen_simple_overlay_action_mode.xml b/current/support/v7/appcompat/res/layout/abc_screen_simple_overlay_action_mode.xml
index c02c2aa..1f58d1e 100644
--- a/current/support/v7/appcompat/res/layout/abc_screen_simple_overlay_action_mode.xml
+++ b/current/support/v7/appcompat/res/layout/abc_screen_simple_overlay_action_mode.xml
@@ -36,4 +36,4 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-</android.support.v7.widget.FitWindowsFrameLayout>
\ No newline at end of file
+</android.support.v7.widget.FitWindowsFrameLayout>
diff --git a/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml b/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml
index 12bcbf1..233ba37 100644
--- a/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml
+++ b/current/support/v7/appcompat/res/layout/abc_select_dialog_material.xml
@@ -20,16 +20,19 @@
     This layout file is inflated and used as the ListView to display the items.
     Assign an ID so its state will be saved/restored.
 -->
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
       android:id="@+id/select_dialog_listview"
+      style="@style/Widget.AppCompat.ListView"
+      class="android.support.v7.app.AlertController$RecycleListView"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:cacheColorHint="@null"
-      android:divider="?attr/listDividerAlertDialog"
-      android:scrollbars="vertical"
-      android:overScrollMode="ifContentScrolls"
-      android:fadingEdge="none"
-      android:paddingTop="@dimen/abc_dialog_list_padding_vertical_material"
-      android:paddingBottom="@dimen/abc_dialog_list_padding_vertical_material"
       android:clipToPadding="false"
-      style="@style/Widget.AppCompat.ListView" />
\ No newline at end of file
+      android:divider="?attr/listDividerAlertDialog"
+      android:fadingEdge="none"
+      android:overScrollMode="ifContentScrolls"
+      android:scrollbars="vertical"
+      android:textAlignment="viewStart"
+      app:paddingBottomNoButtons="@dimen/abc_dialog_list_padding_bottom_no_buttons"
+      app:paddingTopNoTitle="@dimen/abc_dialog_list_padding_top_no_title"/>
diff --git a/current/support/v7/appcompat/res/layout/notification_action.xml b/current/support/v7/appcompat/res/layout/notification_action.xml
index 82e95a5..428dd52 100644
--- a/current/support/v7/appcompat/res/layout/notification_action.xml
+++ b/current/support/v7/appcompat/res/layout/notification_action.xml
@@ -41,4 +41,4 @@
         android:singleLine="true"
         android:ellipsize="end"
         android:clickable="false"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout/notification_action_tombstone.xml b/current/support/v7/appcompat/res/layout/notification_action_tombstone.xml
index d491c78..748d935 100644
--- a/current/support/v7/appcompat/res/layout/notification_action_tombstone.xml
+++ b/current/support/v7/appcompat/res/layout/notification_action_tombstone.xml
@@ -48,4 +48,4 @@
         android:clickable="false"
         android:enabled="false"
         android:alpha="0.5"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout/notification_template_custom_big.xml b/current/support/v7/appcompat/res/layout/notification_template_custom_big.xml
index c922629..70871a0 100644
--- a/current/support/v7/appcompat/res/layout/notification_template_custom_big.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_custom_big.xml
@@ -73,4 +73,4 @@
             />
         </LinearLayout>
     </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout/notification_template_lines_media.xml b/current/support/v7/appcompat/res/layout/notification_template_lines_media.xml
index 9a7b788..0f0ba4a 100644
--- a/current/support/v7/appcompat/res/layout/notification_template_lines_media.xml
+++ b/current/support/v7/appcompat/res/layout/notification_template_lines_media.xml
@@ -109,4 +109,4 @@
             android:paddingStart="8dp"
             />
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/current/support/v7/appcompat/res/layout/support_simple_spinner_dropdown_item.xml b/current/support/v7/appcompat/res/layout/support_simple_spinner_dropdown_item.xml
index d2f177a..52b22f0 100644
--- a/current/support/v7/appcompat/res/layout/support_simple_spinner_dropdown_item.xml
+++ b/current/support/v7/appcompat/res/layout/support_simple_spinner_dropdown_item.xml
@@ -22,4 +22,4 @@
           android:singleLine="true"
           android:layout_width="match_parent"
           android:layout_height="?attr/dropdownListPreferredItemHeight"
-          android:ellipsize="marquee"/>
\ No newline at end of file
+          android:ellipsize="marquee"/>
diff --git a/current/support/v7/appcompat/res/values-hdpi/styles_base.xml b/current/support/v7/appcompat/res/values-hdpi/styles_base.xml
index fd55289..bfe60b6 100644
--- a/current/support/v7/appcompat/res/values-hdpi/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-hdpi/styles_base.xml
@@ -20,4 +20,4 @@
           <item name="gapBetweenBars">3.33dp</item>
           <item name="drawableSize">24dp</item>
      </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-hy-rAM/strings.xml b/current/support/v7/appcompat/res/values-hy-rAM/strings.xml
index c714b9c..dd52611 100644
--- a/current/support/v7/appcompat/res/values-hy-rAM/strings.xml
+++ b/current/support/v7/appcompat/res/values-hy-rAM/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="4076576682505996667">"Կատարված է"</string>
+    <string name="abc_action_mode_done" msgid="4076576682505996667">"Պատրաստ է"</string>
     <string name="abc_action_bar_home_description" msgid="4600421777120114993">"Ուղղվել տուն"</string>
     <string name="abc_action_bar_up_description" msgid="1594238315039666878">"Ուղղվել վերև"</string>
     <string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Այլ ընտրանքներ"</string>
diff --git a/current/support/v7/appcompat/res/values-kn-rIN/strings.xml b/current/support/v7/appcompat/res/values-kn-rIN/strings.xml
index e240f96..ce95380 100644
--- a/current/support/v7/appcompat/res/values-kn-rIN/strings.xml
+++ b/current/support/v7/appcompat/res/values-kn-rIN/strings.xml
@@ -23,7 +23,7 @@
     <string name="abc_toolbar_collapse_description" msgid="1603543279005712093">"ಸಂಕುಚಿಸು"</string>
     <string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string>
     <string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string>
-    <string name="abc_searchview_description_search" msgid="8264924765203268293">"ಹುಡುಕು"</string>
+    <string name="abc_searchview_description_search" msgid="8264924765203268293">"ಹುಡುಕಿ"</string>
     <string name="abc_search_hint" msgid="7723749260725869598">"ಹುಡುಕಿ…"</string>
     <string name="abc_searchview_description_query" msgid="2550479030709304392">"ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ"</string>
     <string name="abc_searchview_description_clear" msgid="3691816814315814921">"ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು"</string>
@@ -36,5 +36,5 @@
     <string name="status_bar_notification_info_overflow" msgid="2869576371154716097">"999+"</string>
     <string name="abc_capital_on" msgid="3405795526292276155">"ಆನ್"</string>
     <string name="abc_capital_off" msgid="121134116657445385">"ಆಫ್"</string>
-    <string name="search_menu_title" msgid="146198913615257606">"ಹುಡುಕು"</string>
+    <string name="search_menu_title" msgid="146198913615257606">"ಹುಡುಕಿ"</string>
 </resources>
diff --git a/current/support/v7/appcompat/res/values-land/dimens.xml b/current/support/v7/appcompat/res/values-land/dimens.xml
index f0b6892..25bf75d 100644
--- a/current/support/v7/appcompat/res/values-land/dimens.xml
+++ b/current/support/v7/appcompat/res/values-land/dimens.xml
@@ -18,4 +18,4 @@
     <!-- Size of the indeterminate Progress Bar -->
     <dimen name="abc_action_bar_progress_bar_size">32dp</dimen>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-land/dimens_material.xml b/current/support/v7/appcompat/res/values-land/dimens_material.xml
index 80b7463..f1cb18a 100644
--- a/current/support/v7/appcompat/res/values-land/dimens_material.xml
+++ b/current/support/v7/appcompat/res/values-land/dimens_material.xml
@@ -22,4 +22,4 @@
     <!-- Default text size for action bar subtitle.-->
     <dimen name="abc_text_size_subtitle_material_toolbar">12dp</dimen>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-night/themes_daynight.xml b/current/support/v7/appcompat/res/values-night/themes_daynight.xml
index 42bbf53..8736722 100644
--- a/current/support/v7/appcompat/res/values-night/themes_daynight.xml
+++ b/current/support/v7/appcompat/res/values-night/themes_daynight.xml
@@ -47,4 +47,4 @@
          {@code android.support.v7.app.AlertDialog} class. -->
     <style name="Theme.AppCompat.DayNight.Dialog.Alert" parent="Theme.AppCompat.Dialog.Alert" />
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-sw600dp/config.xml b/current/support/v7/appcompat/res/values-sw600dp/config.xml
index fba21e1..732dba5 100644
--- a/current/support/v7/appcompat/res/values-sw600dp/config.xml
+++ b/current/support/v7/appcompat/res/values-sw600dp/config.xml
@@ -22,4 +22,4 @@
 <resources>
     <!-- see comment in values/config.xml -->
     <dimen name="abc_config_prefDialogWidth">580dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-sw600dp/dimens.xml b/current/support/v7/appcompat/res/values-sw600dp/dimens.xml
index 86f9c75..d5233b2 100644
--- a/current/support/v7/appcompat/res/values-sw600dp/dimens.xml
+++ b/current/support/v7/appcompat/res/values-sw600dp/dimens.xml
@@ -30,4 +30,4 @@
     <!-- Default end padding of an action bar. -->
     <dimen name="abc_action_bar_default_padding_end_material">8dp</dimen>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v11/styles_base.xml b/current/support/v7/appcompat/res/values-v11/styles_base.xml
index f651320..083e56e 100644
--- a/current/support/v7/appcompat/res/values-v11/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-v11/styles_base.xml
@@ -33,4 +33,4 @@
            parent="android:Widget.Holo.ProgressBar">
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v11/styles_base_text.xml b/current/support/v7/appcompat/res/values-v11/styles_base_text.xml
index 4227794..a2ce395 100644
--- a/current/support/v7/appcompat/res/values-v11/styles_base_text.xml
+++ b/current/support/v7/appcompat/res/values-v11/styles_base_text.xml
@@ -61,4 +61,4 @@
         <item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v11/themes_base.xml b/current/support/v7/appcompat/res/values-v11/themes_base.xml
index e0ac24d..d38ef32 100644
--- a/current/support/v7/appcompat/res/values-v11/themes_base.xml
+++ b/current/support/v7/appcompat/res/values-v11/themes_base.xml
@@ -158,4 +158,29 @@
 
     <style name="Base.ThemeOverlay.AppCompat.Dialog" parent="Base.V11.ThemeOverlay.AppCompat.Dialog" />
 
+    <style name="Base.ThemeOverlay.AppCompat.Dialog.Alert">
+        <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
+        <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
+    </style>
+
+    <style name="Base.Theme.AppCompat.Dialog.Alert">
+        <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
+        <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
+    </style>
+
+    <style name="Base.Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
+        <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
+    </style>
+
+    <style name="Base.Theme.AppCompat.Dialog.MinWidth">
+        <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
+        <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
+    </style>
+
+    <style name="Base.Theme.AppCompat.Light.Dialog.MinWidth">
+        <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
+        <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
+    </style>
+
 </resources>
diff --git a/current/support/v7/appcompat/res/values-v14/styles.xml b/current/support/v7/appcompat/res/values-v14/styles.xml
index 39419d2..ecea88a 100644
--- a/current/support/v7/appcompat/res/values-v14/styles.xml
+++ b/current/support/v7/appcompat/res/values-v14/styles.xml
@@ -35,4 +35,4 @@
 
     <style name="TextAppearance.AppCompat.Notification"
         parent="@android:style/TextAppearance.StatusBar.EventContent"/>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v14/styles_base_text.xml b/current/support/v7/appcompat/res/values-v14/styles_base_text.xml
index 54c8de2..188618d 100644
--- a/current/support/v7/appcompat/res/values-v14/styles_base_text.xml
+++ b/current/support/v7/appcompat/res/values-v14/styles_base_text.xml
@@ -23,4 +23,4 @@
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v21/colors.xml b/current/support/v7/appcompat/res/values-v21/colors.xml
index 4a1b209..7300aa4 100644
--- a/current/support/v7/appcompat/res/values-v21/colors.xml
+++ b/current/support/v7/appcompat/res/values-v21/colors.xml
@@ -16,4 +16,4 @@
   -->
 <resources>
     <color name="notification_action_color_filter">@color/secondary_text_default_material_light</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v21/dimens.xml b/current/support/v7/appcompat/res/values-v21/dimens.xml
index de665a6..b56faf1 100644
--- a/current/support/v7/appcompat/res/values-v21/dimens.xml
+++ b/current/support/v7/appcompat/res/values-v21/dimens.xml
@@ -21,4 +21,4 @@
     <dimen name="notification_media_narrow_margin">12dp</dimen>
     <!-- the top padding of the notification content -->
     <dimen name="notification_main_column_padding_top">0dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v21/styles.xml b/current/support/v7/appcompat/res/values-v21/styles.xml
index 1c435ae..8ea9896 100644
--- a/current/support/v7/appcompat/res/values-v21/styles.xml
+++ b/current/support/v7/appcompat/res/values-v21/styles.xml
@@ -55,4 +55,4 @@
         <item name="android:background">@drawable/notification_action_background</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v23/styles_base_text.xml b/current/support/v7/appcompat/res/values-v23/styles_base_text.xml
index 9f6bf2d..689948e 100644
--- a/current/support/v7/appcompat/res/values-v23/styles_base_text.xml
+++ b/current/support/v7/appcompat/res/values-v23/styles_base_text.xml
@@ -21,4 +21,4 @@
     <!-- We can use the fixed TextAppearance.Material.Widget.ActionBar.Menu on 23+ -->
     <style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Menu" parent="android:TextAppearance.Material.Widget.ActionBar.Menu" />
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v24/styles.xml b/current/support/v7/appcompat/res/values-v24/styles.xml
index 52bb3d4..9f5ec02 100644
--- a/current/support/v7/appcompat/res/values-v24/styles.xml
+++ b/current/support/v7/appcompat/res/values-v24/styles.xml
@@ -25,4 +25,4 @@
 
     <style name="TextAppearance.AppCompat.Notification.Title.Media" />
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values-v24/styles_base_text.xml b/current/support/v7/appcompat/res/values-v24/styles_base_text.xml
index 2e6182d..301bd42 100644
--- a/current/support/v7/appcompat/res/values-v24/styles_base_text.xml
+++ b/current/support/v7/appcompat/res/values-v24/styles_base_text.xml
@@ -20,4 +20,4 @@
 
     <style name="Base.TextAppearance.AppCompat.Widget.Button.Borderless.Colored" parent="android:TextAppearance.Material.Widget.Button.Borderless.Colored" />
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml
index f9990db..03ddeec 100644
--- a/current/support/v7/appcompat/res/values/attrs.xml
+++ b/current/support/v7/appcompat/res/values/attrs.xml
@@ -1038,6 +1038,7 @@
         <attr name="multiChoiceItemLayout" format="reference" />
         <attr name="singleChoiceItemLayout" format="reference" />
         <attr name="listItemLayout" format="reference" />
+        <attr name="showTitle" format="boolean" />
     </declare-styleable>
 
     <!-- @hide -->
@@ -1101,4 +1102,11 @@
         <attr name="android:textAppearance" />
     </declare-styleable>
 
+    <declare-styleable name="RecycleListView">
+        <!-- Bottom padding to use when no buttons are present. -->
+        <attr name="paddingBottomNoButtons" format="dimension" />
+        <!-- Top padding to use when no title is present. -->
+        <attr name="paddingTopNoTitle" format="dimension" />
+    </declare-styleable>
+
 </resources>
diff --git a/current/support/v7/appcompat/res/values/colors.xml b/current/support/v7/appcompat/res/values/colors.xml
index 92c91fd..c474d89 100644
--- a/current/support/v7/appcompat/res/values/colors.xml
+++ b/current/support/v7/appcompat/res/values/colors.xml
@@ -28,4 +28,4 @@
     <!-- The color of the material notification background for media notifications when no custom
      color is specified -->
     <color name="notification_material_background_media_default_color">#ff424242</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values/dimens.xml b/current/support/v7/appcompat/res/values/dimens.xml
index 7467beb..e055eed 100644
--- a/current/support/v7/appcompat/res/values/dimens.xml
+++ b/current/support/v7/appcompat/res/values/dimens.xml
@@ -72,13 +72,13 @@
 
     <dimen name="abc_dialog_padding_material">24dp</dimen>
     <dimen name="abc_dialog_padding_top_material">18dp</dimen>
+    <dimen name="abc_dialog_title_divider_material">8dp</dimen>
+    <dimen name="abc_dialog_list_padding_top_no_title">8dp</dimen>
+    <dimen name="abc_dialog_list_padding_bottom_no_buttons">8dp</dimen>
 
     <!-- Dialog button bar height -->
     <dimen name="abc_alert_dialog_button_bar_height">48dp</dimen>
 
-    <!-- Padding above and below selection dialog lists. -->
-    <dimen name="abc_dialog_list_padding_vertical_material">8dp</dimen>
-
     <!-- Dialog padding minus control padding, used to fix alignment. -->
     <dimen name="abc_select_dialog_padding_start_material">20dp</dimen>
 
diff --git a/current/support/v7/appcompat/res/values/donottranslate_material.xml b/current/support/v7/appcompat/res/values/donottranslate_material.xml
index 3f01f7a..02d7472 100644
--- a/current/support/v7/appcompat/res/values/donottranslate_material.xml
+++ b/current/support/v7/appcompat/res/values/donottranslate_material.xml
@@ -29,4 +29,4 @@
     <string name="abc_font_family_caption_material">sans-serif</string>
     <string name="abc_font_family_button_material">sans-serif-medium</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values/strings.xml b/current/support/v7/appcompat/res/values/strings.xml
index 3f1d959..c5b2f82 100644
--- a/current/support/v7/appcompat/res/values/strings.xml
+++ b/current/support/v7/appcompat/res/values/strings.xml
@@ -74,4 +74,4 @@
     <!-- Default text for a button that can be toggled on and off. -->
     <string name="abc_capital_off">OFF</string>
     <string name="search_menu_title">Search</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml
index b8c1f29..a760b78 100644
--- a/current/support/v7/appcompat/res/values/styles_base.xml
+++ b/current/support/v7/appcompat/res/values/styles_base.xml
@@ -468,7 +468,6 @@
 
     <style name="Base.Widget.AppCompat.Button.ButtonBar.AlertDialog" parent="Widget.AppCompat.Button.Borderless.Colored">
         <item name="android:minWidth">64dp</item>
-        <item name="android:maxLines">2</item>
         <item name="android:minHeight">@dimen/abc_alert_dialog_button_bar_height</item>
     </style>
 
diff --git a/current/support/v7/appcompat/res/values/styles_base_text.xml b/current/support/v7/appcompat/res/values/styles_base_text.xml
index 6a43144..15e45d2 100644
--- a/current/support/v7/appcompat/res/values/styles_base_text.xml
+++ b/current/support/v7/appcompat/res/values/styles_base_text.xml
@@ -147,4 +147,4 @@
         <item name="android:textColor">@color/abc_btn_colored_borderless_text_material</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml
index df3473d..92e7bce 100644
--- a/current/support/v7/appcompat/res/values/themes_base.xml
+++ b/current/support/v7/appcompat/res/values/themes_base.xml
@@ -272,10 +272,10 @@
 
         <!-- Define these here; ContextThemeWrappers around themes that define them should
              always clear these values. -->
-        <item name="windowFixedWidthMajor">0dp</item>
-        <item name="windowFixedWidthMinor">0dp</item>
-        <item name="windowFixedHeightMajor">0dp</item>
-        <item name="windowFixedHeightMinor">0dp</item>
+        <item name="windowFixedWidthMajor">@null</item>
+        <item name="windowFixedWidthMinor">@null</item>
+        <item name="windowFixedHeightMajor">@null</item>
+        <item name="windowFixedHeightMinor">@null</item>
     </style>
 
     <!-- Base platform-dependent theme providing an action bar in a light-themed activity. -->
@@ -433,10 +433,10 @@
 
         <!-- Define these here; ContextThemeWrappers around themes that define them should
              always clear these values. -->
-        <item name="windowFixedWidthMajor">0dp</item>
-        <item name="windowFixedWidthMinor">0dp</item>
-        <item name="windowFixedHeightMajor">0dp</item>
-        <item name="windowFixedHeightMinor">0dp</item>
+        <item name="windowFixedWidthMajor">@null</item>
+        <item name="windowFixedWidthMinor">@null</item>
+        <item name="windowFixedHeightMajor">@null</item>
+        <item name="windowFixedHeightMinor">@null</item>
     </style>
 
     <style name="Base.Theme.AppCompat" parent="Base.V7.Theme.AppCompat">
@@ -675,6 +675,11 @@
         <item name="listPreferredItemPaddingRight">24dip</item>
 
         <item name="android:listDivider">@null</item>
+
+        <item name="windowFixedWidthMajor">@null</item>
+        <item name="windowFixedWidthMinor">@null</item>
+        <item name="windowFixedHeightMajor">@null</item>
+        <item name="windowFixedHeightMinor">@null</item>
     </style>
 
 </resources>
diff --git a/current/support/v7/appcompat/res/values/themes_daynight.xml b/current/support/v7/appcompat/res/values/themes_daynight.xml
index d20f818..2dc7688 100644
--- a/current/support/v7/appcompat/res/values/themes_daynight.xml
+++ b/current/support/v7/appcompat/res/values/themes_daynight.xml
@@ -47,4 +47,4 @@
          {@code android.support.v7.app.AlertDialog} class. -->
     <style name="Theme.AppCompat.DayNight.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert" />
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
index 3333a36..33e1e6f 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
Binary files differ
diff --git a/current/support/v7/cardview/res/values-v23/styles.xml b/current/support/v7/cardview/res/values-v23/styles.xml
index 6961704..c8d09b4 100644
--- a/current/support/v7/cardview/res/values-v23/styles.xml
+++ b/current/support/v7/cardview/res/values-v23/styles.xml
@@ -20,4 +20,4 @@
         <item name="cardBackgroundColor">?android:attr/colorBackgroundFloating</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/cardview/res/values/attrs.xml b/current/support/v7/cardview/res/values/attrs.xml
index deed51b..efdd51b 100644
--- a/current/support/v7/cardview/res/values/attrs.xml
+++ b/current/support/v7/cardview/res/values/attrs.xml
@@ -43,4 +43,4 @@
         <!-- Workaround to read user defined minimum height -->
         <attr name="android:minHeight"/>
     </declare-styleable>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/cardview/res/values/colors.xml b/current/support/v7/cardview/res/values/colors.xml
index df202d1..30354ef 100644
--- a/current/support/v7/cardview/res/values/colors.xml
+++ b/current/support/v7/cardview/res/values/colors.xml
@@ -23,4 +23,4 @@
     <color name="cardview_shadow_start_color">#37000000</color>
     <!-- Shadow color for the furthest pixels around CardView. -->
     <color name="cardview_shadow_end_color">#03000000</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/cardview/res/values/dimens.xml b/current/support/v7/cardview/res/values/dimens.xml
index ebfbb3a..d72130d 100644
--- a/current/support/v7/cardview/res/values/dimens.xml
+++ b/current/support/v7/cardview/res/values/dimens.xml
@@ -22,4 +22,4 @@
     <!-- Inset shadow for RoundRectDrawableWithShadow. It is used to avoid gaps between the card
      and the shadow. -->
     <dimen name="cardview_compat_inset_shadow">1dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/cardview/res/values/styles.xml b/current/support/v7/cardview/res/values/styles.xml
index 2ab8a41..168f63d 100644
--- a/current/support/v7/cardview/res/values/styles.xml
+++ b/current/support/v7/cardview/res/values/styles.xml
@@ -36,4 +36,4 @@
         <item name="cardBackgroundColor">@color/cardview_dark_background</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
index 6c094db..e64b3f2 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
Binary files differ
diff --git a/current/support/v7/gridlayout/res/values/attrs.xml b/current/support/v7/gridlayout/res/values/attrs.xml
index 8eea3d9..10442b1 100644
--- a/current/support/v7/gridlayout/res/values/attrs.xml
+++ b/current/support/v7/gridlayout/res/values/attrs.xml
@@ -190,4 +190,4 @@
         </attr>
     </declare-styleable>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/gridlayout/res/values/dimens.xml b/current/support/v7/gridlayout/res/values/dimens.xml
index 189f409..28a55fd 100644
--- a/current/support/v7/gridlayout/res/values/dimens.xml
+++ b/current/support/v7/gridlayout/res/values/dimens.xml
@@ -4,4 +4,4 @@
     <!-- The default gap between components in a layout. -->
     <dimen name="default_gap">8dip</dimen>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
index fd55194..ad33947 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_dark.xml b/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_dark.xml
index 54f348c..9fca0a9 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_dark.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_dark.xml
@@ -20,4 +20,4 @@
         android:shape="rectangle">
     <corners android:radius="2dp" />
     <solid android:color="@color/background_floating_material_dark" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_light.xml b/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_light.xml
index b5d82af..6b40a5d 100644
--- a/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_light.xml
+++ b/current/support/v7/mediarouter/res/drawable/mr_dialog_material_background_light.xml
@@ -20,4 +20,4 @@
         android:shape="rectangle">
     <corners android:radius="2dp" />
     <solid android:color="@color/background_floating_material_light" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/current/support/v7/mediarouter/res/values/attrs.xml b/current/support/v7/mediarouter/res/values/attrs.xml
index 5ebc0ee..cf6a7b5 100644
--- a/current/support/v7/mediarouter/res/values/attrs.xml
+++ b/current/support/v7/mediarouter/res/values/attrs.xml
@@ -21,6 +21,8 @@
              and non-checked / non-checkable indicates
              that media is playing to the local device only. -->
         <attr name="externalRouteEnabledDrawable" format="reference" />
+        <!-- Tint to apply to the media route button -->
+        <attr name="buttonTint" format="color" />
 
         <attr name="android:minWidth" />
         <attr name="android:minHeight" />
@@ -36,4 +38,6 @@
     <attr name="mediaRouteSpeakerIconDrawable" format="reference" />
     <attr name="mediaRouteSpeakerGroupIconDrawable" format="reference" />
     <attr name="mediaRouteControlPanelThemeOverlay" format="reference" />
+
+    <attr name="mediaRouteTheme" format="reference" />
 </resources>
diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar
index 91ff6d3..adacbf8 100644
--- a/current/support/v7/palette/libs/android-support-v7-palette.jar
+++ b/current/support/v7/palette/libs/android-support-v7-palette.jar
Binary files differ
diff --git a/current/support/v7/preference/libs/android-support-v7-preference.jar b/current/support/v7/preference/libs/android-support-v7-preference.jar
index b03af64..b4dea30 100644
--- a/current/support/v7/preference/libs/android-support-v7-preference.jar
+++ b/current/support/v7/preference/libs/android-support-v7-preference.jar
Binary files differ
diff --git a/current/support/v7/preference/res/layout/preference_widget_seekbar.xml b/current/support/v7/preference/res/layout/preference_widget_seekbar.xml
new file mode 100644
index 0000000..9d7da5c
--- /dev/null
+++ b/current/support/v7/preference/res/layout/preference_widget_seekbar.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout used by SeekBarPreference for the seekbar widget style. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:gravity="center_vertical"
+              android:paddingEnd="?android:attr/scrollbarSize"
+              android:clipChildren="false"
+              android:clipToPadding="false">
+
+    <ImageView
+            android:id="@+android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:minWidth="@dimen/preference_icon_minWidth"/>
+
+    <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dip"
+            android:layout_marginEnd="8dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1"
+            android:clipChildren="false"
+            android:clipToPadding="false">
+
+        <TextView android:id="@+android:id/title"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:ellipsize="marquee"
+                  android:fadingEdge="horizontal"/>
+
+        <TextView android:id="@+android:id/summary"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@android:id/title"
+                  android:layout_alignStart="@android:id/title"
+                  android:textAppearance="?android:attr/textAppearanceSmall"
+                  android:textColor="?android:attr/textColorSecondary"
+                  android:maxLines="4"/>
+
+        <!-- Using UnPressableLinearLayout as a workaround to disable the pressed state propagation
+        to the children of this container layout. Otherwise, the animated pressed state will also
+        play for the thumb in the AbsSeekBar in addition to the preference's ripple background.
+        The background of the SeekBar is also set to null to disable the ripple background -->
+        <android.support.v7.preference.UnPressableLinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/summary"
+                android:layout_alignStart="@android:id/title"
+                android:clipChildren="false"
+                android:clipToPadding="false">
+            <SeekBar
+                    android:id="@+id/seekbar"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/preference_seekbar_padding_start"
+                    android:paddingEnd="@dimen/preference_seekbar_padding_end"
+                    android:focusable="false"
+                    android:clickable="false"
+                    android:background="@null" />
+
+            <TextView android:id="@+id/seekbar_value"
+                      android:layout_width="@dimen/preference_seekbar_value_width"
+                      android:layout_height="match_parent"
+                      android:gravity="right|center_vertical"
+                      android:fontFamily="sans-serif-condensed"
+                      android:singleLine="true"
+                      android:textAppearance="?android:attr/textAppearanceMedium"
+                      android:ellipsize="marquee"
+                      android:fadingEdge="horizontal"/>
+        </android.support.v7.preference.UnPressableLinearLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/current/support/v7/preference/res/values/attrs.xml b/current/support/v7/preference/res/values/attrs.xml
index bd64109..4dfcc1c 100644
--- a/current/support/v7/preference/res/values/attrs.xml
+++ b/current/support/v7/preference/res/values/attrs.xml
@@ -254,4 +254,23 @@
         <attr name="selectableItemBackground" />
     </declare-styleable>
 
+    <declare-styleable name="SeekBarPreference">
+        <attr name="min" format="integer"/>
+        <attr name="android:max"/>
+        <attr name="android:layout" />
+        <!--Attribute controlling the amount to increment or decrement the seekbar when the user
+        presses the arrow keys-->
+        <attr name="seekBarIncrement" format="integer" />
+        <!-- Attribute indicating whether the slider within this preference can be adjusted, that is
+        pressing left/right keys when this preference is focused will move the slider accordingly
+        (e.g. inline adjustable preferences). False, if the slider within the preference is
+        read-only and cannot be adjusted. By default, the seekbar is adjustable. -->
+        <attr name="adjustable" format="boolean" />
+        <!-- Flag indicating whether the TextView next to the seekbar that shows the current seekbar
+        value will be displayed. If true, the view is VISIBLE; if false, the view will be GONE.
+        By default, this view is VISIBLE. -->
+        <attr name="showSeekBarValue" format="boolean" />
+    </declare-styleable>
+
+
 </resources>
diff --git a/current/support/v7/preference/res/values/dimens.xml b/current/support/v7/preference/res/values/dimens.xml
new file mode 100644
index 0000000..f5ecbc9
--- /dev/null
+++ b/current/support/v7/preference/res/values/dimens.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Minimum space to allocate to the left of a preference item for an icon.
+    This helps in aligning titles when some items have icons and some don't. When space is
+    at a premium, we don't pre-allocate any space. -->
+    <dimen name="preference_icon_minWidth">0dp</dimen>
+    <!-- The padding to the left of the seekbar view within a SeekBarPreference -->
+    <dimen name="preference_seekbar_padding_start">0dp</dimen>
+    <!-- The padding to the right of the seekbar view within a SeekBarPreference -->
+    <dimen name="preference_seekbar_padding_end">22dp</dimen>
+    <!-- The width of the TextView indicating the current value of the SeekBarPreference -->
+    <dimen name="preference_seekbar_value_width">36dp</dimen>
+</resources>
diff --git a/current/support/v7/preference/res/values/styles.xml b/current/support/v7/preference/res/values/styles.xml
index 06b24fa..e61a361 100644
--- a/current/support/v7/preference/res/values/styles.xml
+++ b/current/support/v7/preference/res/values/styles.xml
@@ -49,6 +49,12 @@
         <item name="android:switchTextOff">@string/v7_preference_off</item>
     </style>
 
+    <style name="Preference.SeekBarPreference">
+        <item name="android:layout">@layout/preference_widget_seekbar</item>
+        <item name="adjustable">true</item>
+        <item name="showSeekBarValue">true</item>
+    </style>
+
     <style name="Preference.PreferenceScreen">
     </style>
 
diff --git a/current/support/v7/preference/res/values/themes.xml b/current/support/v7/preference/res/values/themes.xml
index bb7f496..af5f469 100644
--- a/current/support/v7/preference/res/values/themes.xml
+++ b/current/support/v7/preference/res/values/themes.xml
@@ -24,6 +24,7 @@
         <item name="preferenceInformationStyle">@style/Preference.Information</item>
         <item name="checkBoxPreferenceStyle">@style/Preference.CheckBoxPreference</item>
         <item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat</item>
+        <item name="seekBarPreferenceStyle">@style/Preference.SeekBarPreference</item>
         <item name="dialogPreferenceStyle">@style/Preference.DialogPreference</item>
         <item name="editTextPreferenceStyle">@style/Preference.DialogPreference.EditTextPreference</item>
         <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList</item>
diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
index 6714f40..0a6fe4d 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
Binary files differ
diff --git a/current/support/v7/recyclerview/res/values/attrs.xml b/current/support/v7/recyclerview/res/values/attrs.xml
index a0d73c9..40661e8 100644
--- a/current/support/v7/recyclerview/res/values/attrs.xml
+++ b/current/support/v7/recyclerview/res/values/attrs.xml
@@ -38,4 +38,4 @@
         <attr name="reverseLayout" format="boolean" />
         <attr name="stackFromEnd" format="boolean" />
     </declare-styleable>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/support/v7/recyclerview/res/values/dimens.xml b/current/support/v7/recyclerview/res/values/dimens.xml
index 90c41b9..91a7e8d 100644
--- a/current/support/v7/recyclerview/res/values/dimens.xml
+++ b/current/support/v7/recyclerview/res/values/dimens.xml
@@ -21,4 +21,4 @@
     <dimen name="item_touch_helper_max_drag_scroll_per_frame">20dp</dimen>
     <dimen name="item_touch_helper_swipe_escape_velocity">120dp</dimen>
     <dimen name="item_touch_helper_swipe_escape_max_velocity">800dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/current/uiautomator.jar b/current/uiautomator.jar
index c1733ed..109ff90 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ
diff --git a/system-api/26.txt b/system-api/26.txt
index c5a2a8e..df7da5f 100644
--- a/system-api/26.txt
+++ b/system-api/26.txt
@@ -12399,12 +12399,6 @@
     enum_constant public static final android.graphics.Interpolator.Result NORMAL;
   }
 
-  public deprecated class LayerRasterizer extends android.graphics.Rasterizer {
-    ctor public LayerRasterizer();
-    method public void addLayer(android.graphics.Paint, float, float);
-    method public void addLayer(android.graphics.Paint);
-  }
-
   public class LightingColorFilter extends android.graphics.ColorFilter {
     ctor public LightingColorFilter(int, int);
   }
@@ -12566,7 +12560,6 @@
     method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float);
     method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float);
     method public android.graphics.PathEffect getPathEffect();
-    method public deprecated android.graphics.Rasterizer getRasterizer();
     method public float getRunAdvance(char[], int, int, int, int, boolean, int);
     method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int);
     method public android.graphics.Shader getShader();
@@ -12623,7 +12616,6 @@
     method public void setLinearText(boolean);
     method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter);
     method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect);
-    method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer);
     method public android.graphics.Shader setShader(android.graphics.Shader);
     method public void setShadowLayer(float, float, float, int);
     method public void setStrikeThruText(boolean);
@@ -12929,10 +12921,6 @@
     ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
   }
 
-  public deprecated class Rasterizer {
-    ctor public Rasterizer();
-  }
-
   public final class Rect implements android.os.Parcelable {
     ctor public Rect();
     ctor public Rect(int, int, int, int);
@@ -37503,19 +37491,7 @@
 
 package android.service.persistentdata {
 
-  public abstract interface IPersistentDataBlockService implements android.os.IInterface {
-    method public abstract int getDataBlockSize() throws android.os.RemoteException;
-    method public abstract int getFlashLockState() throws android.os.RemoteException;
-    method public abstract long getMaximumDataBlockSize() throws android.os.RemoteException;
-    method public abstract boolean getOemUnlockEnabled() throws android.os.RemoteException;
-    method public abstract byte[] read() throws android.os.RemoteException;
-    method public abstract void setOemUnlockEnabled(boolean) throws android.os.RemoteException;
-    method public abstract void wipe() throws android.os.RemoteException;
-    method public abstract int write(byte[]) throws android.os.RemoteException;
-  }
-
   public class PersistentDataBlockManager {
-    ctor public PersistentDataBlockManager(android.service.persistentdata.IPersistentDataBlockService);
     method public int getDataBlockSize();
     method public int getFlashLockState();
     method public long getMaximumDataBlockSize();
@@ -42461,12 +42437,6 @@
     method public void writeToParcel(android.os.Parcel, int);
   }
 
-  public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
-    ctor public RasterizerSpan(android.graphics.Rasterizer);
-    method public android.graphics.Rasterizer getRasterizer();
-    method public void updateDrawState(android.text.TextPaint);
-  }
-
   public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
     ctor public RelativeSizeSpan(float);
     ctor public RelativeSizeSpan(android.os.Parcel);
diff --git a/system_current/android.jar b/system_current/android.jar
index 790bd2e..4c87509 100644
--- a/system_current/android.jar
+++ b/system_current/android.jar
Binary files differ
diff --git a/tools/Android.bp b/tools/Android.bp
index 12df8c1..ba368c2 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -15,5 +15,23 @@
             enabled: true,
         }
     },
-    prefer: false,
+}
+
+cc_prebuilt_shared_library {
+    name: "libclang",
+    host_supported: true,
+    target: {
+        linux_x86_64: {
+            srcs: ["linux/lib64/libclang.so"],
+        },
+        darwin_x86_64: {
+            srcs: ["darwin/lib64/libclang.dylib"],
+        },
+        // TODO(ccross): this is necessary because the prebuilt module must have
+        // all the variants that are in the source module.  Ideally Soong's
+        // arch mutator should handle this.
+        windows: {
+            enabled: true,
+        }
+    },
 }
diff --git a/tools/Android.mk b/tools/Android.mk
index 6adc7a3..a748ce3 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -331,22 +331,4 @@
 
 endif # old version of build/ project.
 
-# Only build Clang/LLVM components when forced to.
-ifneq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
-
-# libLLVM is defined in Android.bp
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libclang
-LOCAL_SRC_FILES := $(HOST_OS)/lib64/$(LOCAL_MODULE)$(HOST_SHLIB_SUFFIX)
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(HOST_SHLIB_SUFFIX)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := 64
-
-include $(BUILD_PREBUILT)
-
-endif #!FORCE_BUILD_LLVM_COMPONENTS
+# libLLVM and libclang are defined in Android.bp
diff --git a/tools/jack b/tools/jack
index 3a8b42e..83a70af 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
 #
 # Settings
 #
-JACK_VERSION=${JACK_VERSION:=4.13.BETA}
+JACK_VERSION=${JACK_VERSION:=4.19.BETA}
 JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
 JACK_CLIENT_SETTING="${JACK_CLIENT_SETTING:=$HOME/.jack-settings}"
 TMPDIR=${TMPDIR:=/tmp}
diff --git a/tools/jack_server_setup.mk b/tools/jack_server_setup.mk
index 780f890..8e42817 100644
--- a/tools/jack_server_setup.mk
+++ b/tools/jack_server_setup.mk
@@ -33,7 +33,16 @@
 endif
 
 .PHONY: setup-jack-server
+ifeq ($(HOST_OS),darwin)
+ALARM :=
+else
+ALARM := $(shell which alarm)
+endif
+ifneq (,$(ALARM))
+setup-jack-server : PRIVATE_JACK_ADMIN := $(ALARM) -l 600 $(LOCAL_PATH)/jack-admin
+else
 setup-jack-server : PRIVATE_JACK_ADMIN := $(LOCAL_PATH)/jack-admin
+endif
 setup-jack-server : PRIVATE_PATH := $(LOCAL_PATH)
 setup-jack-server : PRIVATE_SERVER_VERSION := $(jack_server_version)
 setup-jack-server : PRIVATE_SERVER_JAR := $(jack_server_jar)
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index e5cf7f9..c6892de 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -18,10 +18,10 @@
 jack_jar_tools := $(LOCAL_PATH)/jack-jar-tools.jar
 jack_eng_jar := $(LOCAL_PATH)/jacks/jack.jar
 
-JACK_STABLE_VERSION := 4.13.BETA
-JACK_DOGFOOD_VERSION := 4.13.BETA
-JACK_SDKTOOL_VERSION := 4.13.BETA
-JACK_LANG_DEV_VERSION := 4.13.BETA
+JACK_STABLE_VERSION := 4.19.BETA
+JACK_DOGFOOD_VERSION := 4.18.BETA
+JACK_SDKTOOL_VERSION := 4.19.BETA
+JACK_LANG_DEV_VERSION := 4.19.BETA
 ifneq ("$(wildcard $(jack_eng_jar))","")
 JACK_ENGINEERING_VERSION := $(shell java -jar $(jack_jar_tools) --version-code jack $(jack_eng_jar))
 endif
diff --git a/tools/jacks/jack-4.13.BETA.jar b/tools/jacks/jack-4.18.BETA.jar
similarity index 63%
copy from tools/jacks/jack-4.13.BETA.jar
copy to tools/jacks/jack-4.18.BETA.jar
index c581c4b..c179c12 100644
--- a/tools/jacks/jack-4.13.BETA.jar
+++ b/tools/jacks/jack-4.18.BETA.jar
Binary files differ
diff --git a/tools/jacks/jack-4.13.BETA.jar b/tools/jacks/jack-4.19.BETA.jar
similarity index 80%
rename from tools/jacks/jack-4.13.BETA.jar
rename to tools/jacks/jack-4.19.BETA.jar
index c581c4b..9ee97db 100644
--- a/tools/jacks/jack-4.13.BETA.jar
+++ b/tools/jacks/jack-4.19.BETA.jar
Binary files differ
diff --git a/tools/jills/jill-4.13.BETA.jar b/tools/jills/jill-4.18.BETA.jar
similarity index 89%
copy from tools/jills/jill-4.13.BETA.jar
copy to tools/jills/jill-4.18.BETA.jar
index db42816..7f937ed 100644
--- a/tools/jills/jill-4.13.BETA.jar
+++ b/tools/jills/jill-4.18.BETA.jar
Binary files differ
diff --git a/tools/jills/jill-4.13.BETA.jar b/tools/jills/jill-4.19.BETA.jar
similarity index 89%
rename from tools/jills/jill-4.13.BETA.jar
rename to tools/jills/jill-4.19.BETA.jar
index db42816..1659b07 100644
--- a/tools/jills/jill-4.13.BETA.jar
+++ b/tools/jills/jill-4.19.BETA.jar
Binary files differ