StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp

Browse Source 
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
This commit is contained in:
Ying Wang
2011-08-11 16:55:00 -07:00
parent c55ebf232e a74a4811ae
commit 6d38bdfc7b
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/common.py
View File

@@ -29,11 +29,9 @@ import time
import zipfile
try:
import hashlib
sha1 = hashlib.sha1
from hashlib import sha1 as sha1
except ImportError:
import sha
sha1 = sha.sha
from sha import sha as sha1
# missing in Python 2.4 and before
if not hasattr(os, "SEEK_SET"):