merge in jb-release history after reset to master
diff --git a/src/compatibility/4.0/android-4.0-cdd.pdf b/src/compatibility/4.0/android-4.0-cdd.pdf
index 389d5aa..f6c06a5 100755
--- a/src/compatibility/4.0/android-4.0-cdd.pdf
+++ b/src/compatibility/4.0/android-4.0-cdd.pdf
Binary files differ
diff --git a/src/compatibility/android-cts-manual-r4.pdf b/src/compatibility/android-cts-manual-r4.pdf
index b990531..a5861ac 100644
--- a/src/compatibility/android-cts-manual-r4.pdf
+++ b/src/compatibility/android-cts-manual-r4.pdf
Binary files differ
diff --git a/src/compatibility/cts-intro.md b/src/compatibility/cts-intro.md
index c9550df..0f62b84 100644
--- a/src/compatibility/cts-intro.md
+++ b/src/compatibility/cts-intro.md
@@ -32,7 +32,7 @@
## Workflow ##
-1. [Download](downloads.html) the CTS.
+1. [Download](downloads.html) the CTS and CTS media files.
1. Attach at least one device (or emulator) to your machine.
@@ -48,6 +48,12 @@
2. On the device, enable all the android.deviceadmin.cts.* device administrators under Settings > Location & security > Select device administrators
+1. For CTS 2.3 R12 and beyond, the CTS media files must be copied to the device's external storage. Check section 4.2 of the latest CTS manual for further details on copying these files:
+
+ 2. Unzip the CTS Media zip file.
+
+ 2. Run copy_media.sh [720x480|1280x720|1920x1080|all] [-s serial]. If no resolution is specified, the default maximum resolution of 480x360 is assumed.
+
1. Launch the CTS. The CTS test harness loads the test plan onto the attached devices. For each test in the test harness:
- The test harness pushes a .apk file to each device, executes the test through instrumentation, and records test results.
diff --git a/src/compatibility/downloads.md b/src/compatibility/downloads.md
index 5894e5c..045dbcd 100644
--- a/src/compatibility/downloads.md
+++ b/src/compatibility/downloads.md
@@ -26,7 +26,7 @@
Android 4.0.3 is found in the 'android-4.0.3_r1' branch in the open-source tree.
- [Android 4.0 Compatibility Definition Document (CDD)](4.0/android-4.0-cdd.pdf)
-- [Android 4.0.3 R1 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-4.0.3_r1-linux_x86-arm.zip)
+- [Android 4.0.3 R2 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-4.0.3_r2-linux_x86-arm.zip)
- [Android 4.0.3 R1 CTS Verifier](http://dl.google.com/dl/android/cts/android-cts-verifier-4.0.3_r1-linux_x86-arm.zip)
## Android 2.3 ##
@@ -36,7 +36,7 @@
the open-source tree.
- [Android 2.3 Compatibility Definition Document (CDD)](2.3/android-2.3.3-cdd.pdf)
-- [Android 2.3 R11 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-2.3_r11-linux_x86-arm.zip)
+- [Android 2.3 R12 Compatibility Test Suite (CTS)](http://dl.google.com/dl/android/cts/android-cts-2.3_r12-linux_x86-arm.zip)
- [Android 2.3 R2 CTS Verifier](http://dl.google.com/dl/android/cts/android-cts-verifier-2.3_r2-linux_x86-armv5.zip)
## Android 2.2 ##
@@ -74,6 +74,11 @@
- [Compatibility Test Suite (CTS) User Manual](android-cts-manual-r4.pdf)
+## CTS Media Files ##
+These media files are required for the CTS media stress tests.
+
+- [CTS Media 1.0](http://dl.google.com/dl/android/cts/android-cts-media-1.0.zip)
+
## Older Android Versions ##
There is no Compatibility Program for older versions of Android, such as Android