| commit | 8c47a69d3bc9a5d930f4e296684305ab171788d4 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sun Oct 12 06:15:14 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Sun Oct 12 06:15:14 2014 -0700 |
| tree | ff5351e62be69d377957f795b26c9efc52d6be45 | |
| parent | 87c7980aeb5bc9a6423ddbac1dba345bee8f9b91 [diff] | |
| parent | da2c101d935a714188bb61af49562c2ace204f62 [diff] |
merge in lmp-release history after reset to 87c7980aeb5bc9a6423ddbac1dba345bee8f9b91
diff --git a/21/android.jar b/21/android.jar index 30b16b4..d66f8bb 100644 --- a/21/android.jar +++ b/21/android.jar Binary files differ
diff --git a/21/uiautomator.jar b/21/uiautomator.jar index 4d98240..96134b4 100644 --- a/21/uiautomator.jar +++ b/21/uiautomator.jar Binary files differ
diff --git a/api/21.txt b/api/21.txt index 01db5a7..09497a5 100644 --- a/api/21.txt +++ b/api/21.txt
@@ -67,7 +67,7 @@ field public static final java.lang.String FORCE_BACK = "android.permission.FORCE_BACK"; field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS"; field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE"; - field public static final java.lang.String GET_TASKS = "android.permission.GET_TASKS"; + field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS"; field public static final java.lang.String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO"; field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH"; field public static final java.lang.String HARDWARE_TEST = "android.permission.HARDWARE_TEST"; @@ -21399,6 +21399,7 @@ field public static final int KITKAT = 19; // 0x13 field public static final int KITKAT_WATCH = 20; // 0x14 field public static final int L = 21; // 0x15 + field public static final int LOLLIPOP = 21; // 0x15 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/current/android.jar b/current/android.jar index f742e6a..d66f8bb 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 2bed859..0fffcf5 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/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar index 274be3f..6938b34 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 4dd658d..1ff3294 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/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar index 757ca18..40b6660 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/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar index f04b081..527422f 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/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar index 3e14c59..fcd2394 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 3d103da..4b81b0f 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 193e7ee..e69a5dd 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 4c39397..0d4879e 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 78ebc3f..03a245c 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 c67ef42..09f20f4 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/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar index 73d6ec7..7354bcc 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 3725c58..96134b4 100644 --- a/current/uiautomator.jar +++ b/current/uiautomator.jar Binary files differ
diff --git a/tools/linux/aapt b/tools/linux/aapt index 8bcb1e0..ae10d86 100755 --- a/tools/linux/aapt +++ b/tools/linux/aapt Binary files differ