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

Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad

tools/releasetools/check_target_files_signatures

@@ -52,6 +52,11 @@ import subprocess
 import tempfile
 import zipfile
 
+try:
+  from hashlib import sha1 as sha1
+except ImportError:
+  from sha import sha as sha1
+
 import common
 
 # Work around a bug in python's zipfile module that prevents opening

tools/releasetools/common.py

@@ -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"):

tools/releasetools/ota_from_target_files

@@ -63,6 +63,11 @@ import tempfile
 import time
 import zipfile
 
+try:
+  from hashlib import sha1 as sha1
+except ImportError:
+  from sha import sha as sha1
+
 import common
 import edify_generator