| commit | fc5f3bd8c918850b985c5e7e7d939b12a54c61b8 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Mon Feb 16 18:01:57 2015 -0800 |
| committer | The Android Automerger <android-build@google.com> | Mon Feb 16 18:01:57 2015 -0800 |
| tree | 6d7cae81b184a2f0f47f770ecea23cbb3544b54d | |
| parent | 8663a58b7712184b3d17e1b24dd6696b5e72ba33 [diff] | |
| parent | 3fce9817f610799a1df1e451313712bcee9c86c1 [diff] |
merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/current/android.jar b/current/android.jar index 8331f22..6cf3a2c 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 a672438..b95d159 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 484468d..077a168 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 41cbb00..36d262a 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 4e06c60..f7988a3 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 fd6e4d0..38e6dcc 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 dd1f005..b31462a 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 dda0c9f..37408c6 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 7672944..ef8c87a 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 3c27a08..070f1e0 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 cfe44e5..594efbd 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 df3c3e8..1a88a52 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 a1478b0..ff0c4cd 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 dc67680..b701856 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 5fa21f5..8eece32 100644 --- a/system_current/android.jar +++ b/system_current/android.jar Binary files differ
diff --git a/tools/linux/aapt b/tools/linux/aapt index b4f7049..26f5f44 100755 --- a/tools/linux/aapt +++ b/tools/linux/aapt Binary files differ