DO NOT MERGE ANYWHERE. update sdk and support lib from build MRZ43.

17 files changed, 20 insertions, 4 deletions

diff --git a/current/android.jar b/current/android.jar
index 5fe98d9..5f9d124 100644
--- a/current/android.jar
+++ b/current/android.jar
diff --git a/current/framework.aidl b/current/framework.aidl
index 0efac89..56349f9 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -38,6 +38,7 @@ parcelable android.graphics.RectF;
 parcelable android.graphics.Rect;
 parcelable android.accounts.AuthenticatorDescription;
 parcelable android.accounts.Account;
+parcelable android.app.admin.SystemUpdatePolicy;
 parcelable android.print.PrintDocumentInfo;
 parcelable android.print.PageRange;
 parcelable android.print.PrintAttributes;
@@ -73,10 +74,11 @@ parcelable android.net.LinkProperties;
 parcelable android.net.Uri;
 parcelable android.net.NetworkRequest;
 parcelable android.net.LinkAddress;
-parcelable android.view.Surface;
-parcelable android.view.WindowContentFrameStats;
+parcelable android.view.Display.Mode;
 parcelable android.view.InputDevice;
 parcelable android.view.InputEvent;
+parcelable android.view.Surface;
+parcelable android.view.WindowContentFrameStats;
 parcelable android.view.inputmethod.InputMethodSubtype;
 parcelable android.view.inputmethod.CursorAnchorInfo;
 parcelable android.view.inputmethod.CompletionInfo;
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index e3b9d59..905b83e 100644
--- a/current/support/annotations/android-support-annotations.jar
+++ b/current/support/annotations/android-support-annotations.jar
diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar
index b2d2482..b953bb9 100644
--- a/current/support/design/libs/android-support-design.jar
+++ b/current/support/design/libs/android-support-design.jar
diff --git a/current/support/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml
index e2afe99..a89d330 100644
--- a/current/support/design/res/values/attrs.xml
+++ b/current/support/design/res/values/attrs.xml
@@ -205,11 +205,22 @@
     </declare-styleable>
 
     <declare-styleable name="CollapsingToolbarLayout">
+        <!--  Specifies extra space on the start, top, end and bottom
+              sides of the the expanded title text. Margin values should be positive. -->
         <attr name="expandedTitleMargin" format="dimension"/>
+        <!--  Specifies extra space on the start side of the the expanded title text.
+              Margin values should be positive. -->
         <attr name="expandedTitleMarginStart" format="dimension"/>
-        <attr name="expandedTitleMarginBottom" format="dimension"/>
+        <!--  Specifies extra space on the top side of the the expanded title text.
+              Margin values should be positive. -->
+        <attr name="expandedTitleMarginTop" format="dimension"/>
+        <!--  Specifies extra space on the end side of the the expanded title text.
+              Margin values should be positive. -->
         <attr name="expandedTitleMarginEnd" format="dimension"/>
-        <!-- The text appearance of the CollapsingToolbarLayouts title when it is fully
+        <!--  Specifies extra space on the bottom side of the the expanded title text.
+              Margin values should be positive. -->
+        <attr name="expandedTitleMarginBottom" format="dimension"/>
+        <!-- The text appearance of the CollapsingToolbarLayout's title when it is fully
              'expanded' -->
         <attr name="expandedTitleTextAppearance" format="reference"/>
         <!-- The text appearance of the CollapsingToolbarLayouts title when it is fully
@@ -222,6 +233,9 @@
              CollapsingToolbarLayout has been scrolled sufficiently off screen. Only works on
              Lollipop with the correct setup. -->
         <attr name="statusBarScrim" format="color" />
+        <!-- The id of the primary Toolbar child that you wish to use for the purpose of collapsing.
+             If you do not set this then the first Toolbar child found will be used. -->
+        <attr name="toolbarId" format="reference"/>
     </declare-styleable>
 
     <declare-styleable name="CollapsingAppBarLayout_LayoutParams">
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 30e1faa..49c3b8c 100644
--- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
+++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar
index f5a207d..5ff478c 100644
--- a/current/support/multidex/library/libs/android-support-multidex.jar
+++ b/current/support/multidex/library/libs/android-support-multidex.jar
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index c509f81..bc971ba 100644
--- a/current/support/v13/android-support-v13.jar
+++ b/current/support/v13/android-support-v13.jar
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 5d0b7b9..699db45 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index 85cd42a..4203b19 100644
--- a/current/support/v4/android-support-v4.jar
+++ b/current/support/v4/android-support-v4.jar
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 e173846..836ac64 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
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 056ed85..e596ca4 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
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 b37b495..3469811 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
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 1f29954..670e3bc 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
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 2f3c87c..7dd3065 100644
--- a/current/support/v7/palette/libs/android-support-v7-palette.jar
+++ b/current/support/v7/palette/libs/android-support-v7-palette.jar
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 fdfa093..26eec2e 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
diff --git a/current/uiautomator.jar b/current/uiautomator.jar
index 1b8a91f..2744478 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar