| commit | a43f117eacc3d3cabec15649241094d194c8774a | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sat Nov 08 06:15:38 2014 -0800 |
| committer | The Android Automerger <android-build@google.com> | Sat Nov 08 06:15:38 2014 -0800 |
| tree | d8ea650f7a8dcba9b1d990f85e6deccdb2feb494 | |
| parent | d3a7457a1021bd6382eba08684a1298e2ddd4b18 [diff] | |
| parent | 753817f9577fe074789422d951485bdf350cb75f [diff] |
merge in lmp-mr1-release history after reset to d3a7457a1021bd6382eba08684a1298e2ddd4b18
diff --git a/current/android.jar b/current/android.jar index 35bebfa..58d93ca 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 4f1e38c..73d3dc1 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 4573975..3faf93b 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 b9f280f..df7e57a 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 1bcda5f..bb0a360 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 cb90d82..d7097cd 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/layout/lb_details_overview.xml b/current/support/v17/leanback/res/layout/lb_details_overview.xml index 1e4e0fc..7b94d5d 100644 --- a/current/support/v17/leanback/res/layout/lb_details_overview.xml +++ b/current/support/v17/leanback/res/layout/lb_details_overview.xml
@@ -59,7 +59,7 @@ <android.support.v17.leanback.widget.NonOverlappingFrameLayout android:id="@+id/details_overview_description" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:gravity="top"
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar index 316ed48..08c684f 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 8278864..e6b5ea1 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 9ef8e23..42106d1 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 fa94bdb..018386a 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 3a0d234..842798e 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 e875d99..3332dc4 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 5dc678f..53eb5d8 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 eb8a108..cd5f043 100644 --- a/current/uiautomator.jar +++ b/current/uiautomator.jar Binary files differ
diff --git a/tools/linux/aapt b/tools/linux/aapt index 83cc09c..cf1adf8 100755 --- a/tools/linux/aapt +++ b/tools/linux/aapt Binary files differ