| commit | 55a43308ddad8410e86bd206cd8de2f5fa087ee8 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Sep 25 10:14:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 25 10:14:20 2014 +0000 |
| tree | d188460a7ca30f858d83d29324ae8e66865f2172 | |
| parent | 45a31d8d9da5f24c69db39523f6f31b3b970c49a [diff] | |
| parent | aa2e7f778399d74ac5647fbade43829049d55608 [diff] |
am aa2e7f77: am 2a4f610a: (-s ours) Manual cherry-pick of ag/554094. Fixes linter errors. * commit 'aa2e7f778399d74ac5647fbade43829049d55608': Manual cherry-pick of ag/554094. Fixes linter errors.
diff --git a/current/android.jar b/current/android.jar index 684e73a..3a862ba 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 c264bbd..5c0a114 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 c0627b1..bece1c6 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 d8562aa..cc77611 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 c99e9e2..01dd41f 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 e55f16f..9a21dee 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/values-da/strings.xml b/current/support/v17/leanback/res/values-da/strings.xml index 51a195a..064be9a 100644 --- a/current/support/v17/leanback/res/values-da/strings.xml +++ b/current/support/v17/leanback/res/values-da/strings.xml
@@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="orb_search_action" msgid="5651268540267663887">"Søgehandling"</string> + <string name="orb_search_action" msgid="5651268540267663887">"Søg handling"</string> <string name="lb_search_bar_hint" msgid="8325490927970116252">"Søg"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Tal for at søge"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Søg efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar index 72ab71f..9c536e0 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 095da65..4e93619 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 0e545ca..ac261cf 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 2190c85..55784bb 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 468d2b1..e3130cf 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/mediarouter/res/values-hi/strings.xml b/current/support/v7/mediarouter/res/values-hi/strings.xml index 9b1f77e..6c9526c 100644 --- a/current/support/v7/mediarouter/res/values-hi/strings.xml +++ b/current/support/v7/mediarouter/res/values-hi/strings.xml
@@ -20,6 +20,6 @@ <string name="mr_user_route_category_name" msgid="7498112907524977311">"उपकरण"</string> <string name="mr_media_route_button_content_description" msgid="8327680881775995150">"कास्ट करें"</string> <string name="mr_media_route_chooser_title" msgid="7106830097177242655">"उपकरण से कनेक्ट करें"</string> - <string name="mr_media_route_chooser_searching" msgid="7553005460920830010">"उपकरणों की खोज हो रही है…"</string> + <string name="mr_media_route_chooser_searching" msgid="7553005460920830010">"डिवाइस की खोज हो रही है…"</string> <string name="mr_media_route_controller_disconnect" msgid="109793632378378069">"डिस्कनेक्ट करें"</string> </resources>
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 15fcf15..d76d438 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 731e4a3..70e64bb 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 38a257f..d9cd944 100644 --- a/current/uiautomator.jar +++ b/current/uiautomator.jar Binary files differ