| commit | 23f7de5ba433fc82269ba63c203fe0a3eaf4a680 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Wed Oct 12 17:05:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 12 17:05:50 2016 +0000 |
| tree | 0b10cb141b2e6fcb0670a309206821b2898293da | |
| parent | 4d610a5b5141bdc08899a6af5c9f5045cee605d1 [diff] | |
| parent | 5e9de23f8c5a65766a9834502635ef1f1376991d [diff] |
Merge "Add API 25 prebuilts." into nyc-mr1-dev am: 5e9de23f8c Change-Id: Ibfa3e86d81c0730149cbe29c063877d6a1691fa2
diff --git a/current/android.jar b/current/android.jar index d9ba218..85dc427 100644 --- a/current/android.jar +++ b/current/android.jar Binary files differ
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar index ab329f2..e04a826 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/customtabs/libs/android-support-customtabs.jar b/current/support/customtabs/libs/android-support-customtabs.jar index 9ca5eda..7bed17e 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 9dd2d82..c866ce9 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/documents-archive/libs/android-support-documents-archive.jar b/current/support/documents-archive/libs/android-support-documents-archive.jar index 1570f00..914931a 100644 --- a/current/support/documents-archive/libs/android-support-documents-archive.jar +++ b/current/support/documents-archive/libs/android-support-documents-archive.jar Binary files differ
diff --git a/current/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar b/current/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar index 4f67fd0..de9e7ae 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 2fe1150..6445499 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 3d5a6df..c5b4fc9 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/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar index 72a9677..3ba8b06 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 0c96c67..26af1aa 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 e458936..25e1bd1 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 f452158..7c71b1b 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 1a26608..f3783a0 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/v14/preference/libs/android-support-v14-preference.jar b/current/support/v14/preference/libs/android-support-v14-preference.jar index 189bc79..1933697 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/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar index 0d4df0c..59813e5 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/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml index 0069ec8..0e97f76 100644 --- a/current/support/v17/leanback/res/values/attrs.xml +++ b/current/support/v17/leanback/res/values/attrs.xml
@@ -555,7 +555,7 @@ <declare-styleable name="PagingIndicator"> <!-- Attributes for the radius of the dot. --> - <attr name="dotRadius" format="reference" /> + <attr name="lbDotRadius" format="reference" /> <!-- Attributes for the radius of the arrow. --> <attr name="arrowRadius" format="reference" /> <!-- Attributes for the distance between the centers of the adjacent dots. -->
diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml index 59bf520..0666cdd 100644 --- a/current/support/v17/leanback/res/values/styles.xml +++ b/current/support/v17/leanback/res/values/styles.xml
@@ -731,7 +731,7 @@ <item name="android:layout_gravity">center_horizontal</item> <item name="android:focusable">true</item> <item name="android:contentDescription">@string/lb_onboarding_accessibility_next</item> - <item name="dotRadius">@dimen/lb_page_indicator_dot_radius</item> + <item name="lbDotRadius">@dimen/lb_page_indicator_dot_radius</item> <item name="arrowRadius">@dimen/lb_page_indicator_arrow_radius</item> <item name="dotToDotGap">@dimen/lb_page_indicator_dot_gap</item> <item name="dotToArrowGap">@dimen/lb_page_indicator_arrow_gap</item>
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 4873309..3468516 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/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar index dcdbb71..21ec7e4 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 b94ff7e..bc5b17c 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/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar index ae153aa..ffc543a 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/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar index 9b5503a..57cae18 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/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar index cf535c2..680e106 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/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar index 963af12..568c103 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 16ec6be..38e9aa3 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/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar index c04a5f7..ebddf24 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/uiautomator.jar b/current/uiautomator.jar index ebad16a..5d717c6 100644 --- a/current/uiautomator.jar +++ b/current/uiautomator.jar Binary files differ
diff --git a/system_current/android.jar b/system_current/android.jar index 7a6e38a..ab677ff 100644 --- a/system_current/android.jar +++ b/system_current/android.jar Binary files differ