am e30dbd19: Add documentation for new security features in the Android 4.2 release.
* commit 'e30dbd19a0d334de0ae526b6f3927b92da8ef34c':
Add documentation for new security features in the Android 4.2 release.
diff --git a/src/compatibility/cts-development.md b/src/compatibility/cts-development.md
index 6cee879..ea43d1c 100644
--- a/src/compatibility/cts-development.md
+++ b/src/compatibility/cts-development.md
@@ -44,11 +44,11 @@
cd /path/to/android/root
make cts
- cts
+ cts-tradefed
-Provide arguments to CTS to immediately start executing a test:
+At the cts-tf console, enter e.g.:
- cts start --plan CTS -p android.os.cts.BuildVersionTest
+ run cts --plan CTS -p android.os.cts.BuildVersionTest
## Writing CTS Tests ##
diff --git a/src/source/initializing.md b/src/source/initializing.md
index ac50857..266900a 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -56,7 +56,7 @@
Detailed instructions for Ubuntu and MacOS follow. In general you will need:
- - Python 2.5 -- 2.7, which you can download from [python.org](http://www.python.org/download/).
+ - Python 2.6 -- 2.7, which you can download from [python.org](http://www.python.org/download/).
- GNU Make 3.81 -- 3.82, which you can download from [gnu.org](http://ftp.gnu.org/gnu/make/),
@@ -109,7 +109,7 @@
Building on Ubuntu 12.04 is currently only experimentally supported and is not
guaranteed to work on branches other than master.
- $ sudo apt-get install git-core gnupg flex bison gperf build-essential \
+ $ sudo apt-get install git gnupg flex bison gperf build-essential \
zip curl libc6-dev libncurses5-dev:i386 x11proto-core-dev \
libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-glx:i386 \
libgl1-mesa-dev g++-multilib mingw32 openjdk-6-jdk tofrodos \
diff --git a/src/source/overview.md b/src/source/overview.md
index 804c1f0..7f664ca 100644
--- a/src/source/overview.md
+++ b/src/source/overview.md
@@ -23,6 +23,10 @@
The links below will navigate you away from this site.
+## [Android 4.1](https://developer.android.com/about/versions/jelly-bean.html) ##
+
+Android 4.1 corresponded to the "Jelly Bean" milestone branch, and has an API level of 16.
+
## [Android 4.0](https://developer.android.com/sdk/android-4.0-highlights.html) ##
Android 4.0 corresponded to the "IceCreamSandwich" milestone branch, and has an API level of 14.