| commit | cb697188676127cc0afa2c10206c0546890a776a | [log] [tgz] |
|---|---|---|
| author | Rodrigo Lagos <rlagos@google.com> | Thu Apr 19 13:40:23 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 19 13:40:23 2018 -0700 |
| tree | fa5eb0c4b3e9bbd955b7a53954b9965032ae64da | |
| parent | eb82c92bfae7207991d2dec6d3e4ae1a4ca75089 [diff] | |
| parent | 27c8682ce9465031a2adfd9400a5e8d061853321 [diff] |
Rename back arrow resounce to avoid overrite from merge am: 27c8682ce9 Change-Id: I0692c8e6ab57c3b0bb451b98a5fcbb5ed106a3e2
diff --git a/library/res/drawable/ic_arrow_back.xml b/library/res/drawable/car_ic_arrow_back.xml similarity index 100% rename from library/res/drawable/ic_arrow_back.xml rename to library/res/drawable/car_ic_arrow_back.xml
diff --git a/library/res/layout/car_setup_wizard_toolbar.xml b/library/res/layout/car_setup_wizard_toolbar.xml index 505fd26..e0b343c 100644 --- a/library/res/layout/car_setup_wizard_toolbar.xml +++ b/library/res/layout/car_setup_wizard_toolbar.xml
@@ -35,7 +35,7 @@ android:layout_height="@dimen/car_primary_icon_size" android:layout_gravity="center" android:background="@drawable/button_ripple_bg" - android:src="@drawable/ic_arrow_back"/> + android:src="@drawable/car_ic_arrow_back"/> </FrameLayout> <TextView