Auto stash before merge of "master" and "origin/master"

@@ -60,7 +60,7 @@
                 android:gravity="center"
                 android:text="目录"
                 android:textColor="#616161"
-                android:textSize="12sp" />
+                android:textSize="@dimen/sp_15" />
         </LinearLayout>
 
     </LinearLayout>

@@ -28,5 +28,4 @@
     <color name="color_dddddd">#dddddd</color>
     <color name="color_c7c7c7">#c7c7c7</color>
     <color name="color_d5d5d5">#d5d5d5</color>
->>>>>>> Stashed changes
 </resources>