Skip to content

张胜利 / Androidgroup

Go to a project
Commit f2494ad7 by 张胜利
Options

Merge branch 'zsl2'

parents da798bba 4addc705
Inline Side-by-side
Showing with 7 additions and 3 deletions
imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java
......@@ -14,8 +14,7 @@
* limitations under the License.
*******************************************************************************/
package com.nostra13.universalimageloader.cache.disc;
/** 主线代码修改了呢？2015年2月9日 15:21:09*/
//主线代码再来修改一次 2015年2月9日 15:21:26
import android.graphics.Bitmap;
import com.nostra13.universalimageloader.utils.IoUtils;
......@@ -27,7 +26,11 @@ import java.io.InputStream;
* Interface for disk cache
*
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
* @since 1.9.2
<<<<<<< HEAD
* @since 1.9.1
=======
* @since 1.8.2
>>>>>>> 60c2ed3dd69f390d535e0e9eefcf05fcfbf21102
*/
public interface DiskCache {
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment