commit | 547dface7a3865f20659a1736d823c2ec8bde84f | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@google.com> | Thu Jul 09 01:04:55 2015 -0700 |
committer | The Android Automerger <android-build@google.com> | Thu Jul 09 01:04:55 2015 -0700 |
tree | 259dd8616045daf9b4e761db7cbc34ba24ce4e18 | |
parent | c1ee0e0a5296e8105b96e0cb6c621217ab8fb0b9 [diff] | |
parent | 06dc04030357f324dbcf9253d7fe0b1a5428b680 [diff] |
merge in mnc-release history after reset to mnc-dev
diff --git a/current/android.jar b/current/android.jar index ece3c5c..1140d60 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 66d3afc..b5ee897 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/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar index 46d2af6..ae01fde 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/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar index 3595c89..a3a4c52 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 2ed1c1a..0d0bd2b 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 670b475..5de9634 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/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar index 03e84d7..08e82ad 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 bc3e5ee..8b81c6d 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 81068de..16b6add 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 7c129dd..851ad0e 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 56baf7c..fc703f6 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 2791498..3b2f31a 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 ad402d1..f345104 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 1ea000b..f341d95 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 4cda222..e9f5712 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 2dc4137..48f0241 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 3343e16..4b69b6a 100644 --- a/system_current/android.jar +++ b/system_current/android.jar Binary files differ
diff --git a/update_current.sh b/update_current.sh index 80ae2ba..f7421ef 100755 --- a/update_current.sh +++ b/update_current.sh
@@ -43,6 +43,7 @@ then banner "support library" rm -rf $ROOT_DIR/current/support/ + cd $ROOT_DIR/current unzip $SUPPORT >/dev/null # Remove duplicates