Merge tag 'android-8.0.0_r30' into HEADo8.0

Android 8.0.0 release 30

Conflicts:
	checkstyle.py
	tests.py

Change-Id: I28a2b0cac61df1bfa8d861bb651b1f7ebcb795ae

1 files changed, 1 insertions, 4 deletions

diff --git a/tests.py b/tests.py
index 707111a..74b325e 100755
--- a/tests.py
+++ b/tests.py
@@ -18,10 +18,7 @@
 
 """Tests the Checkstyle script used to run style checks on Java files."""
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from StringIO import StringIO
 import unittest
 import checkstyle