Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of YangSen-qn:qiniu/android-sdk
# Conflicts: # library/src/main/java/com/qiniu/android/common/AutoZone.java # library/src/main/java/com/qiniu/android/common/Config.java # library/src/main/java/com/qiniu/android/common/Zone.java # library/src/main/java/com/qiniu/android/common/ZoneInfo.java # library/src/main/java/com/qiniu/android/http/ResponseInfo.java # library/src/main/java/com/qiniu/android/http/dns/DnsPrefetchTransaction.java # library/src/main/java/com/qiniu/android/http/dns/DnsPrefetcher.java # library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java # library/src/main/java/com/qiniu/android/storage/Configuration.java
- Loading branch information