am d2cd0f05: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'd2cd0f05a2ba440d0d55cb15ca8c575b25ecb377':
diff --git a/src/compatibility/4.1/android-4.1-cdd.pdf b/src/compatibility/4.1/android-4.1-cdd.pdf
index dab2857..4e54ccf 100644
--- a/src/compatibility/4.1/android-4.1-cdd.pdf
+++ b/src/compatibility/4.1/android-4.1-cdd.pdf
Binary files differ
diff --git a/src/compatibility/4.1/versions.md b/src/compatibility/4.1/versions.md
index 26ae803..9b04064 100644
--- a/src/compatibility/4.1/versions.md
+++ b/src/compatibility/4.1/versions.md
@@ -26,7 +26,7 @@
Because subsequent releases of the Android software may revise this string,
but not change any API behavior, such releases may not be accompanied by a new
Compatibility Definition Document. This page lists the versions that are
-allowable by an Android 4.0-based system. The only permitted values for
+allowable by an Android 4.1-based system. The only permitted values for
`android.os.Build.VERSION.RELEASE` for Android 4.1 are:
- 4.1
diff --git a/src/compatibility/android-4.1-cdd.pdf b/src/compatibility/android-4.1-cdd.pdf
index dab2857..4e54ccf 100644
--- a/src/compatibility/android-4.1-cdd.pdf
+++ b/src/compatibility/android-4.1-cdd.pdf
Binary files differ
diff --git a/src/compatibility/cts-development.md b/src/compatibility/cts-development.md
index c1a6e24..6cee879 100644
--- a/src/compatibility/cts-development.md
+++ b/src/compatibility/cts-development.md
@@ -19,7 +19,7 @@
## Initializing Your Repo Client ##
Follow the [instructions](/source/downloading.html)
-to get and build the Android source code but specify `-b android-4.0.3_r1`
+to get and build the Android source code but specify `-b android-4.1.1_r1`
when issuing the `repo init` command. This assures that your CTS
changes will be included in the next CTS release and beyond.
diff --git a/src/compatibility/downloads.md b/src/compatibility/downloads.md
index faf9310..1af5eb5 100644
--- a/src/compatibility/downloads.md
+++ b/src/compatibility/downloads.md
@@ -22,12 +22,12 @@
## Android 4.1 ##
Android 4.1.1 is the release of the development milestone code-named
-Ice Cream Sandwich. Android 4.1.1 is the current version of Android. Source code for
+Jelly Bean. Android 4.1.1 is the current version of Android. Source code for
Android 4.1.1 is found in the 'android-4.1.1_r1' branch in the open-source tree.
- [Android 4.1 Compatibility Definition Document (CDD)](4.1/android-4.1-cdd.pdf)
-- [Android 4.1 R3 Compatibility Test Suite (CTS)](https://dl.google.com/dl/android/cts/android-cts-4.1_r1-linux_x86-arm.zip)
-- [Android 4.1 R2 CTS Verifier](https://dl.google.com/dl/android/cts/android-cts-verifier-4.1_r1-linux_x86-arm.zip)
+- [Android 4.1 R1 Compatibility Test Suite (CTS)](https://dl.google.com/dl/android/cts/android-cts-4.1_r1-linux_x86-arm.zip)
+- [Android 4.1 R1 CTS Verifier](https://dl.google.com/dl/android/cts/android-cts-verifier-4.1_r1-linux_x86-arm.zip)
## Android 4.0.3 ##
@@ -83,7 +83,7 @@
The CTS user manual is applicable to any CTS version, but CTS 2.1 R2 and
beyond require [additional steps](cts-intro.html) to run the accessibility tests.
-- [Compatibility Test Suite (CTS) User Manual](android-cts-manual-r4.pdf)
+- [Compatibility Test Suite (CTS) User Manual](android-cts-manual-r5.pdf)
## CTS Media Files ##
These media files are required for the CTS media stress tests.
diff --git a/src/compatibility/sidebar.md b/src/compatibility/sidebar.md
index 3b96786..9df9f50 100644
--- a/src/compatibility/sidebar.md
+++ b/src/compatibility/sidebar.md
@@ -1,6 +1,6 @@
# Getting Started #
- [Compatibility Overview](/compatibility/overview.html)
-- [Current CDD](/compatibility/4.0/android-4.0-cdd.pdf)
+- [Current CDD](/compatibility/4.1/android-4.1-cdd.pdf)
- [CTS Introduction](/compatibility/cts-intro.html)
- [CTS Development](/compatibility/cts-development.html)