| commit | 99d6c82bf00b10c632bc33a072c6b1a070711ac8 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Jun 06 15:35:21 2016 +0100 |
| committer | Michael Wright <michaelwr@google.com> | Mon Jun 06 15:35:21 2016 +0100 |
| tree | 18cd3b3a32bca0aacb30d28fe36434984886e638 | |
| parent | b966a79861c4c1a97d468dcacab6a63430e3ea20 [diff] |
DO NOT MERGE ANYWHERE Update prebuilts from 2943950 Includes changes to PointerIcon. Used sdk_phone_x86_64-sdk artifacts from build 2943950. Change-Id: I51821f3dcb99732b92953aec0dce4306312ba20a
diff --git a/current/android.jar b/current/android.jar index a3b4db9..d55b3bd 100644 --- a/current/android.jar +++ b/current/android.jar Binary files differ
diff --git a/current/framework.aidl b/current/framework.aidl index 25f7b24..5f2ccff 100644 --- a/current/framework.aidl +++ b/current/framework.aidl
@@ -181,3 +181,4 @@ parcelable android.service.quicksettings.Tile; parcelable android.os.PersistableBundle; parcelable android.net.UidRange; +parcelable android.telephony.PcoData;
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar index bbc413e..c4902c6 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 9d3fc0c..fbb5bfd 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 54bf6d6..0189f09 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/graphics/drawable/libs/android-support-animatedvectordrawable.jar b/current/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar index bf24f10..affa068 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 41d0f48..b5b4289 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 131b431..3894d81 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 b4a21ee..a370710 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 ec6826f..90c4553 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 3770581..af5f021 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/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar index 220ea8d..c66d2df 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 0df4cb5..8bcff3d 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 f8e0dfb..ed7ca12 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/preference-leanback/libs/android-support-v17-preference-leanback.jar b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar index 5e87631..a1d1000 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 80e94e7..e6e4636 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/v4/src/api/current.txt b/current/support/v4/src/api/current.txt index 73ee11d..48dcdf2 100644 --- a/current/support/v4/src/api/current.txt +++ b/current/support/v4/src/api/current.txt
@@ -18,7 +18,7 @@ field public static final java.lang.String PARENT_ACTIVITY = "android.support.PARENT_ACTIVITY"; } - public final class TaskStackBuilder { + public final class TaskStackBuilder implements java.lang.Iterable { method public android.support.v4.app.TaskStackBuilder addNextIntent(android.content.Intent); method public android.support.v4.app.TaskStackBuilder addNextIntentWithParentStack(android.content.Intent); method public android.support.v4.app.TaskStackBuilder addParentStack(android.app.Activity);
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 bde0389..5a1544c 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 7a71679..1bc9bb3 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 f2b508f..cf3834b 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 405f39a..e3bbd31 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 f781e2f..6a48497 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 2a6b110..ba2f89c 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 0f6e6b7..8a0ff64 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 bd66b82..f7134d0 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 5bb2031..baa9525 100644 --- a/system_current/android.jar +++ b/system_current/android.jar Binary files differ