Fix merge issue

This commit is contained in:
topjohnwu
2016-08-25 18:40:00 +08:00
parent 1ba38b3902
commit 6fb9081394
2 changed files with 16 additions and 1 deletions
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/force_reload"
android:icon="@drawable/ic_refresh"
android:title="@string/force_reload"
app:showAsAction="always"/>
</menu>