draft version release notes for 15.0615.06

Change-Id: I44f53e1f1d2bc17cd4789e1df18df6b884414a07
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

13 files changed, 74 insertions, 69 deletions

diff --git a/.gitreview b/.gitreview
index 976738d..2882525 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.android.git.linaro.org
 port=29418
 project=lcr-release.git
+defaultbranch=15.06
diff --git a/android/images/member-lcr-fvp/HOWTO_getsourceandbuild.txt b/android/images/member-lcr-fvp/HOWTO_getsourceandbuild.txt
index c881c3b..82e0330 100644
--- a/android/images/member-lcr-fvp/HOWTO_getsourceandbuild.txt
+++ b/android/images/member-lcr-fvp/HOWTO_getsourceandbuild.txt
@@ -2,19 +2,19 @@ h1. Accessing Source Code
 
 h2. Linaro Android Source Code
 
-Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.05/android/images/member-lcr-fvp/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.06/android/images/member-lcr-fvp/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
 
 The pinned and source manifests can be found here:
 
-* "Pinned Manifest":http://releases.linaro.org/15.05/android/images/member-lcr-fvp/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
-* "Source Manifest":http://releases.linaro.org/15.05/android/images/member-lcr-fvp/source-manifest.xml
+* "Pinned Manifest":http://releases.linaro.org/15.06/android/images/member-lcr-fvp/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/15.06/android/images/member-lcr-fvp/source-manifest.xml
 
 h2. Compiling Linaro Android RootFS+Kernel
 
 The following simple steps download, install and compile a complete Linaro Android distribution
 
 * Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
-* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.05/android/images/member-lcr-fvp/linaro_android_build_cmds.sh
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.06/android/images/member-lcr-fvp/linaro_android_build_cmds.sh
 
 * Run the script
 
diff --git a/android/images/member-lcr-fvp/HOWTO_releasenotes.txt b/android/images/member-lcr-fvp/HOWTO_releasenotes.txt
index 5526551..79961fa 100644
--- a/android/images/member-lcr-fvp/HOWTO_releasenotes.txt
+++ b/android/images/member-lcr-fvp/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Linaro Confectionary Release for FVP (Multi-arch 64-bit)
 
 The Linaro Confectionary release is based on the AOSP Lollipop
-Android-5.1.1_r3 version. The reference build is the userdebug variant
+Android-5.1.1_r4 version. The reference build is the userdebug variant
 build, it contains multi-arch support allowing full use of the 64-bit
 ARMv8-A architecture and supports both 64-bit and 32-bit applications,
 and has selinux enabled by default.
@@ -24,14 +24,16 @@ Additionally, the BIONIC component is validated with Android BIONIC
 tests. Multi-arch support has been validated using examples provided in Android NDK.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":https://releases.linaro.org/15.05/android/images/member-lcr-fvp/#tabs-3).
+(see the "Building from Source tab":https://releases.linaro.org/15.06/android/images/member-lcr-fvp/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the Lollipop Android-5.1.1_r3 version
-* Integrated many ART related optimizations and obtain obvious improvement
-* Changed to use libjpeg-turbo as the defaut system libjpeg.so library and obtain obvious improvement
-* Updated some external projects, including: sqlite, giflib, libpng, harfbuzz_ng, fio
+* Android source changed to base on the Lollipop Android-5.1.1_r4 version
+* Integrated some ART related optimizations and obtain obvious improvement
+* Integrated latest libjpeg-turbo in Chromium, and Make Chromium use the system libjpeg.so instead the one compiled from it's own third_party project.
+* Integrated the laster perf command from AOSP master branch
+* Fixed failures for android.webkit package
+* Synced some external projects (e.g. Freetype and Harfbuzz) with upstream sources
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -45,7 +47,7 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"Building from Source":https://releases.linaro.org/15.05/android/images/member-lcr-fvp/#tabs-3).
+"Building from Source":https://releases.linaro.org/15.06/android/images/member-lcr-fvp/#tabs-3).
 
 h2. Support
 
diff --git a/android/images/member-lcr-juno/HOWTO_getsourceandbuild.txt b/android/images/member-lcr-juno/HOWTO_getsourceandbuild.txt
index f0df5d7..19d7e17 100644
--- a/android/images/member-lcr-juno/HOWTO_getsourceandbuild.txt
+++ b/android/images/member-lcr-juno/HOWTO_getsourceandbuild.txt
@@ -1,25 +1,25 @@
 h2. License
 
-The use of Juno software is subject to the terms of the Juno "End User License Agreement":https://releases.linaro.org/15.05/android/images/member-lcr-juno/armv8-android-juno-lsk/#tabs-4.
+The use of Juno software is subject to the terms of the Juno "End User License Agreement":https://releases.linaro.org/15.06/android/images/member-lcr-juno/#tabs-4.
 
 h1. Accessing Source Code
 
 h2. Linaro Android Source Code
 
-Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.05/android/images/member-lcr-juno/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.06/android/images/member-lcr-juno/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
 
 The pinned and source manifests can be found here:
 
-* "Pinned Manifest":http://releases.linaro.org/15.05/android/images/member-lcr-juno/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
-* "Source Manifest":http://releases.linaro.org/15.05/android/images/member-lcr-juno//source-manifest.xml
+* "Pinned Manifest":http://releases.linaro.org/15.06/android/images/member-lcr-juno/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/15.06/android/images/member-lcr-juno//source-manifest.xml
 
 h2. Compiling Linaro Android RootFS+Kernel
 
 The following simple steps download, install and compile a complete Linaro Android distribution
 
 * Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
-* Accept the EULA and download the Mali graphics (vendor.tar.bz2) libraries from the list of artifacts listed above or "here":https://releases.linaro.org/15.05/android/images/member-lcr-juno//vendor.tar.bz2
-* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.05/android/images/member-lcr-juno/linaro_android_build_cmds.sh
+* Accept the EULA and download the Mali graphics (vendor.tar.bz2) libraries from the list of artifacts listed above or "here":https://releases.linaro.org/15.06/android/images/member-lcr-juno//vendor.tar.bz2
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.06/android/images/member-lcr-juno/linaro_android_build_cmds.sh
 
 * Run the script
 
diff --git a/android/images/member-lcr-juno/HOWTO_releasenotes.txt b/android/images/member-lcr-juno/HOWTO_releasenotes.txt
index 5717311..5007f6d 100644
--- a/android/images/member-lcr-juno/HOWTO_releasenotes.txt
+++ b/android/images/member-lcr-juno/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Member Linaro Confectionary Release for Juno (Multi-arch 64-bit)
 
 This Member Linaro Confectionary Release is based on the Lollipop
-Android-5.1.1_r3 branch. The reference build is a userdebug variant
+Android-5.1.1_r4 branch. The reference build is a userdebug variant
 build, which contains multi-arch support allowing full use of the
 64-bit ARMv8-A architecture, supports both 64-bit and 32-bit
 applications and has selinux enabled by default.
@@ -24,14 +24,17 @@ in Android NDK. We also added some benchmark test to observe the
 performance trend in various fields.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":https://releases.linaro.org/15.05/android/images/member-lcr-juno/#tabs-3).
+(see the "Building from Source tab":https://releases.linaro.org/15.06/android/images/member-lcr-juno/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the Lollipop Android-5.1.1_r3 version
-* Integrated many ART related optimizations and obtain obvious improvement
-* Changed to use libjpeg-turbo as the defaut system libjpeg.so library and obtain obvious improvement
-* Updated some external projects, including: sqlite, giflib, libpng, harfbuzz_ng, fio
+* Android source changed to based on the Lollipop Android-5.1.1_r4 version
+* Integrated some ART related optimizations and obtain obvious improvement
+* Integrated latest libjpeg-turbo in Chromium, and Make Chromium use the system libjpeg.so instead the one compiled from it's own third_party project.
+* Integrated the laster perf command from AOSP master branch
+* Fixed failures for android.webkit package
+* New Mali binaries are updated and get 100% pass-rates on the gles3 cts test package
+* Synced some external projects (e.g. Freetype and Harfbuzz) with upstream sources
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -45,12 +48,12 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"'Building from Source'":https://releases.linaro.org/15.05/android/images/member-lcr-juno/#tabs-3).
+"'Building from Source'":https://releases.linaro.org/15.06/android/images/member-lcr-juno/#tabs-3).
 
 h2. License
 
 The use of Juno software is subject to the terms of the Juno
-"End User License Agreement":https://releases.linaro.org/15.05/android/images/member-lcr-juno/#tabs-4.
+"End User License Agreement":https://releases.linaro.org/15.06/android/images/member-lcr-juno/#tabs-4.
 
 h2. Support
 
@@ -89,13 +92,11 @@ h3. Known issues
 The following known issues are present in this release.  Please contact "support@linaro.org":mailto:support@linaro.org?subject=LCR%20support%20request if you wish to know more information about these issues or have access problems when attempting to view them.
 
 | *Bug ID* | *Bug title* | *Bug summary* |
-| "Bug 1499":https://bugs.linaro.org/show_bug.cgi?id=1499 | Andebenchpro crashes hald the way on Juno | Test automation for Andebenchpro does not return full set of results |
+| "Bug 1499":https://bugs.linaro.org/show_bug.cgi?id=1499 | Andebenchpro crashes half the way on Juno | Test automation for Andebenchpro does not return full set of results |
 | "Bug 1492":https://bugs.linaro.org/show_bug.cgi?id=1492 | android.bionic.string@strncat FAIL | One of our Bionic string routines optimizations seems to violate strict POSIX rules - we are not filling with zeros the remaining unused part of the string. Currently considered WONTFIX. |
-| "Bug 1136":https://bugs.linaro.org/show_bug.cgi?id=1136 | Android.webkit CTS failures on Juno LCR build | Most of Webkit CTS tests fail with same message |
 | "Bug 1131":https://bugs.linaro.org/show_bug.cgi?id=1131 | glslparser test suite failure on Juno | Mali drivers do not score well in this test, needs investigation |
 | "Bug 993":https://bugs.linaro.org/show_bug.cgi?id=993 | EVDEV failures in linaro android kernel test suite on 14.12 LCR build | Few EVDEV tests have always been failing for us |
 | "Bug 795":https://bugs.linaro.org/show_bug.cgi?id=795 | Failing multimedia codec tests | Codecs give different bitstreams on ARMv8 and ARMv7 platforms and tests matching against exact checksums fail. |
-|"Bug 474":https://bugs.linaro.org/show_bug.cgi?id=474 | perf: unhandled input address range fault (11) at 0x8573801f30, esr 0x92000004 | Externally reported issue, waiting validation on LCR release |
 |"Bug 135":https://bugs.linaro.org/show_bug.cgi?id=135 |Juno: Android fails to boot when board has a date in the future |When the board default date is set beyond 19.01.2038 Android fails to boot. This is most likely a bug in generic Android code. As a workaround, the date on the board needs to be set to something before 2038 cut off date. |
 |"Bug 269":https://bugs.linaro.org/show_bug.cgi?id=269 | Wave Blazer app crashes on startup | 3rd party application crash - under investigation. |
 |"Bug 265":https://bugs.linaro.org/show_bug.cgi?id=265 | Truck Parking 3D game crashes on startup | 3rd party application crash - under investigation. |
diff --git a/android/images/member-lcr-vexpress/HOWTO_getsourceandbuild.txt b/android/images/member-lcr-vexpress/HOWTO_getsourceandbuild.txt
index 68506dc..05132b7 100644
--- a/android/images/member-lcr-vexpress/HOWTO_getsourceandbuild.txt
+++ b/android/images/member-lcr-vexpress/HOWTO_getsourceandbuild.txt
@@ -2,19 +2,19 @@ h1. Accessing Source Code
 
 h2. Linaro Android Source Code
 
-Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.05/android/images/member-lcr-vexpress/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.06/android/images/member-lcr-vexpress/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
 
 The pinned and source manifests can be found here:
 
-* "Pinned Manifest":http://releases.linaro.org/15.05/android/images/member-lcr-vexpress/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
-* "Source Manifest":http://releases.linaro.org/15.05/android/images/member-lcr-vexpress//source-manifest.xml
+* "Pinned Manifest":http://releases.linaro.org/15.06/android/images/member-lcr-vexpress/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/15.06/android/images/member-lcr-vexpress//source-manifest.xml
 
 h2. Compiling Linaro Android RootFS+Kernel
 
 The following simple steps download, install and compile a complete Linaro Android distribution
 
 * Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
-* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.05/android/images/member-lcr-juno/linaro_android_build_cmds.sh
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.06/android/images/member-lcr-vexpress/linaro_android_build_cmds.sh
 
 * Run the script
 
@@ -36,4 +36,4 @@ $ linaro_android_build_cmds.sh -t -l <login-id> #Provide login/access ID to clon
 If the linaro_android_build_cmds.sh completely, you will find the boot.tar.bz2, system.tar.bz2 and userdata.tar.bz2 3 files
 under ./android/out/target/product/vexpress directory, please use these 3 file to bood your board.
 
-You can reference to the "Binary Image Installation"::http://releases.linaro.org/15.05/android/images/member-lcr-vexpress#tabs-2 tab for detail instructions.
+You can reference to the "Binary Image Installation"::http://releases.linaro.org/15.06/android/images/member-lcr-vexpress#tabs-2 tab for detail instructions.
diff --git a/android/images/member-lcr-vexpress/HOWTO_releasenotes.txt b/android/images/member-lcr-vexpress/HOWTO_releasenotes.txt
index 01f72f0..0499325 100644
--- a/android/images/member-lcr-vexpress/HOWTO_releasenotes.txt
+++ b/android/images/member-lcr-vexpress/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Linaro Confectionary Release for Versatile Express (Aarch32)
 
 The Linaro Confectionary release is based on the AOSP Lollipop
-Android-5.1.1_r3 version. This reference build is a userdebug variant
+Android-5.1.1_r4 version. This reference build is a userdebug variant
 build, and it contains support allowing full use of the 32-bit ARMv7-A
 architecture and supports the 32-bit applications, with SELinux
 enabled by default.
@@ -17,14 +17,16 @@ BIONIC tests. We also added some benchmark tests to observe the
 performance trend in various fields.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":http://releases.linaro.org/15.05/android/images/member-lcr-vexpress#tabs-3).
+(see the "Building from Source tab":http://releases.linaro.org/15.06/android/images/member-lcr-vexpress#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the Lollipop Android-5.1.1_r3 version
-* Integrated many ART related optimizations and obtain obvious improvement
-* Changed to use libjpeg-turbo as the defaut system libjpeg.so library and obtain obvious improvement
-* Updated some external projects, including: sqlite, giflib, libpng, harfbuzz_ng, fio
+* Android source changed to based on the Lollipop Android-5.1.1_r4 version
+* Integrated some ART related optimizations and obtain obvious improvement
+* Integrated latest libjpeg-turbo in Chromium, and Make Chromium use the system libjpeg.so instead the one compiled from it's own third_party project.
+* Integrated the laster perf command from AOSP master branch
+* Fixed failures for android.webkit package
+* Synced some external projects (e.g. Freetype and Harfbuzz) with upstream sources
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -38,7 +40,7 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"'Building from Source'":http://releases.linaro.org/15.05/android/images/member-lcr-vexpress#tabs-3).
+"'Building from Source'":http://releases.linaro.org/15.06/android/images/member-lcr-vexpress#tabs-3).
 
 h2. Support
 
@@ -77,7 +79,6 @@ The following known issues are present in this release.  Please contact "support
 
 | *Bug ID* | *Bug title* | *Bug summary* |
 | "Bug 1015":https://bugs.linaro.org/show_bug.cgi?id=1015 | monkey long run test fails on TC2 LCR build | Blacklist for known to fail packages has not be updated or deployed - long monkey run fails as result |
-| "Bug 997":https://bugs.linaro.org/show_bug.cgi?id=997 | glslparser test suite partially passes on 14.12 LCR | some glsl syntax in test are not recognized by Mali driver |
 | "Bug 993":https://bugs.linaro.org/show_bug.cgi?id=993 | EVDEV failures in linaro android kernel test suite on 14.12 LCR build | |
 | "Bug 224":https://bugs.linaro.org/show_bug.cgi?id=224 | Corrupted png files can cause crashes in gallery | The stock Gallery application crashes when displaying known corrupt PNG files. |
 | "Bug 222":https://bugs.linaro.org/show_bug.cgi?id=222 | Dev Tools crashes on startup | Dev Tools app fails to instantiate com.android.development.Development class from /system/app/Development.apk |
diff --git a/android/images/reference-lcr-fvp/HOWTO_getsourceandbuild.txt b/android/images/reference-lcr-fvp/HOWTO_getsourceandbuild.txt
index ad69ca3..ea2bf81 100644
--- a/android/images/reference-lcr-fvp/HOWTO_getsourceandbuild.txt
+++ b/android/images/reference-lcr-fvp/HOWTO_getsourceandbuild.txt
@@ -2,19 +2,19 @@ h1. Accessing Source Code
 
 h2. Linaro Android Source Code
 
-Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.05/android/images/reference-lcr-fvp/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.06/android/images/reference-lcr-fvp/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
 
 The pinned and source manifests can be found here:
 
-* "Pinned Manifest":http://releases.linaro.org/15.05/android/images/reference-lcr-fvp/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
-* "Source Manifest":http://releases.linaro.org/15.05/android/images/reference-lcr-fvp/source-manifest.xml
+* "Pinned Manifest":http://releases.linaro.org/15.06/android/images/reference-lcr-fvp/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/15.06/android/images/reference-lcr-fvp/source-manifest.xml
 
 h2. Compiling Linaro Android RootFS+Kernel
 
 The following simple steps download, install and compile a complete Linaro Android distribution
 
 * Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
-* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.05/android/images/reference-lcr-fvp/linaro_android_build_cmds.sh
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.06/android/images/reference-lcr-fvp/linaro_android_build_cmds.sh
 
 * Run the script
 
diff --git a/android/images/reference-lcr-fvp/HOWTO_releasenotes.txt b/android/images/reference-lcr-fvp/HOWTO_releasenotes.txt
index d749eae..fe62a1f 100644
--- a/android/images/reference-lcr-fvp/HOWTO_releasenotes.txt
+++ b/android/images/reference-lcr-fvp/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Linaro Confectionary Release for FVP (Multi-arch 64-bit)
 
 The Linaro Confectionary release is based on the AOSP Lollipop
-Android-5.1.1_r3 version. The reference build is the userdebug variant
+Android-5.1.1_r4 version. The reference build is the userdebug variant
 build, it contains multi-arch support allowing full use of the 64-bit
 ARMv8-A architecture and supports both 64-bit and 32-bit applications,
 and has selinux enabled by default.
@@ -24,11 +24,11 @@ Additionally, the BIONIC component is validated with Android BIONIC
 tests. Multi-arch support has been validated using examples provided in Android NDK.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":https://releases.linaro.org/15.05/android/images/reference-lcr-fvp/#tabs-3).
+(see the "Building from Source tab":https://releases.linaro.org/15.06/android/images/reference-lcr-fvp/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the Lollipop Android-5.1.1_r3 version
+* Android source changed to based on the Lollipop Android-5.1.1_r4 version
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -42,7 +42,7 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"Building from Source":https://releases.linaro.org/15.05/android/images/reference-lcr-fvp/#tabs-3).
+"Building from Source":https://releases.linaro.org/15.06/android/images/reference-lcr-fvp/#tabs-3).
 
 h2. Support
 
diff --git a/android/images/reference-lcr-juno/HOWTO_getsourceandbuild.txt b/android/images/reference-lcr-juno/HOWTO_getsourceandbuild.txt
index 508bddd..9c14214 100644
--- a/android/images/reference-lcr-juno/HOWTO_getsourceandbuild.txt
+++ b/android/images/reference-lcr-juno/HOWTO_getsourceandbuild.txt
@@ -1,25 +1,25 @@
 h2. License
 
-The use of Juno software is subject to the terms of the Juno "End User License Agreement":https://releases.linaro.org/15.05/android/images/reference-lcr-juno/armv8-android-juno-lsk/#tabs-4.
+The use of Juno software is subject to the terms of the Juno "End User License Agreement":https://releases.linaro.org/15.06/android/images/reference-lcr-juno/#tabs-4.
 
 h1. Accessing Source Code
 
 h2. Linaro Android Source Code
 
-Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.05/android/images/reference-lcr-juno/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.06/android/images/reference-lcr-juno/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
 
 The pinned and source manifests can be found here:
 
-* "Pinned Manifest":http://releases.linaro.org/15.05/android/images/reference-lcr-juno/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
-* "Source Manifest":http://releases.linaro.org/15.05/android/images/reference-lcr-juno//source-manifest.xml
+* "Pinned Manifest":http://releases.linaro.org/15.06/android/images/reference-lcr-juno/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/15.06/android/images/reference-lcr-juno//source-manifest.xml
 
 h2. Compiling Linaro Android RootFS+Kernel
 
 The following simple steps download, install and compile a complete Linaro Android distribution
 
 * Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
-* Accept the EULA and download the Mali graphics (vendor.tar.bz2) libraries from the list of artifacts listed above or "here":https://releases.linaro.org/15.05/android/images/reference-lcr-juno//vendor.tar.bz2
-* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.05/android/images/reference-lcr-juno/linaro_android_build_cmds.sh
+* Accept the EULA and download the Mali graphics (vendor.tar.bz2) libraries from the list of artifacts listed above or "here":https://releases.linaro.org/15.06/android/images/reference-lcr-juno//vendor.tar.bz2
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.06/android/images/reference-lcr-juno/linaro_android_build_cmds.sh
 
 * Run the script
 
diff --git a/android/images/reference-lcr-juno/HOWTO_releasenotes.txt b/android/images/reference-lcr-juno/HOWTO_releasenotes.txt
index 3c68826..c12dff3 100644
--- a/android/images/reference-lcr-juno/HOWTO_releasenotes.txt
+++ b/android/images/reference-lcr-juno/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Member Linaro Confectionary Release for Juno (Multi-arch 64-bit)
 
 This Member Linaro Confectionary Release is based on the Lollipop
-Android-5.1.1_r3 branch. The reference build is a userdebug variant
+Android-5.1.1_r4 branch. The reference build is a userdebug variant
 build, which contains multi-arch support allowing full use of the
 64-bit ARMv8-A architecture, supports both 64-bit and 32-bit
 applications and has selinux enabled by default.
@@ -24,11 +24,11 @@ in Android NDK. We also added some benchmark test to observe the performance tre
 fields.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":https://releases.linaro.org/15.05/android/images/reference-lcr-juno/#tabs-3).
+(see the "Building from Source tab":https://releases.linaro.org/15.06/android/images/reference-lcr-juno/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the Lollipop Android-5.1.1_r3 version
+* Android source changed to based on the Lollipop Android-5.1.1_r4 version
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -42,12 +42,12 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"'Building from Source'":https://releases.linaro.org/15.05/android/images/reference-lcr-juno/#tabs-3).
+"'Building from Source'":https://releases.linaro.org/15.06/android/images/reference-lcr-juno/#tabs-3).
 
 h2. License
 
 The use of Juno software is subject to the terms of the Juno
-"End User License Agreement":https://releases.linaro.org/15.05/android/images/reference-lcr-juno/#tabs-4.
+"End User License Agreement":https://releases.linaro.org/15.06/android/images/reference-lcr-juno/#tabs-4.
 
 h2. Support
 
diff --git a/android/images/reference-lcr-vexpress/HOWTO_getsourceandbuild.txt b/android/images/reference-lcr-vexpress/HOWTO_getsourceandbuild.txt
index c158067..97ca5b8 100644
--- a/android/images/reference-lcr-vexpress/HOWTO_getsourceandbuild.txt
+++ b/android/images/reference-lcr-vexpress/HOWTO_getsourceandbuild.txt
@@ -2,19 +2,19 @@ h1. Accessing Source Code
 
 h2. Linaro Android Source Code
 
-Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.05/android/images/reference-lcr-vexpress/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/15.06/android/images/reference-lcr-vexpress//linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
 
 The pinned and source manifests can be found here:
 
-* "Pinned Manifest":http://releases.linaro.org/15.05/android/images/reference-lcr-vexpress/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
-* "Source Manifest":http://releases.linaro.org/15.05/android/images/reference-lcr-vexpress//source-manifest.xml
+* "Pinned Manifest":http://releases.linaro.org/15.06/android/images/reference-lcr-vexpress/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/15.06/android/images/reference-lcr-vexpress/source-manifest.xml
 
 h2. Compiling Linaro Android RootFS+Kernel
 
 The following simple steps download, install and compile a complete Linaro Android distribution
 
 * Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
-* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.05/android/images/reference-lcr-juno/linaro_android_build_cmds.sh
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/15.06/android/images/reference-lcr-vexpress/linaro_android_build_cmds.sh
 
 * Run the script
 
@@ -36,4 +36,4 @@ $ linaro_android_build_cmds.sh -t -l <login-id> #Provide login/access ID to clon
 If the linaro_android_build_cmds.sh completely, you will find the boot.tar.bz2, system.tar.bz2 and userdata.tar.bz2 3 files
 under ./android/out/target/product/vexpress directory, please use these 3 file to bood your board.
 
-You can reference to the "Binary Image Installation"::http://releases.linaro.org/15.05/android/images/reference-lcr-vexpress#tabs-2 tab for detail instructions.
+You can reference to the "Binary Image Installation"::http://releases.linaro.org/15.06/android/images/reference-lcr-vexpress/#tabs-2 tab for detail instructions.
diff --git a/android/images/reference-lcr-vexpress/HOWTO_releasenotes.txt b/android/images/reference-lcr-vexpress/HOWTO_releasenotes.txt
index 02f6dd0..73ed204 100644
--- a/android/images/reference-lcr-vexpress/HOWTO_releasenotes.txt
+++ b/android/images/reference-lcr-vexpress/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Linaro Confectionary Release for Versatile Express (Aarch32)
 
 The Linaro Confectionary release is based on the AOSP Lollipop
-Android-5.1.1_r3 version. This reference build is a userdebug variant
+Android-5.1.1_r4 version. This reference build is a userdebug variant
 build, and it contains support allowing full use of the 32-bit ARMv7-A
 architecture and supports the 32-bit applications, with SELinux
 enabled by default.
@@ -17,11 +17,11 @@ BIONIC tests. We also added some benchmark tests to observe the performance
 trend in various fields.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":http://releases.linaro.org/15.05/android/images/reference-lcr-vexpress#tabs-3).
+(see the "Building from Source tab":http://releases.linaro.org/15.06/android/images/reference-lcr-vexpress/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the Lollipop Android-5.1.1_r3 version
+* Android source changed to based on the Lollipop Android-5.1.1_r4 version
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -35,7 +35,7 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"'Building from Source'":http://releases.linaro.org/15.05/android/images/reference-lcr-vexpress#tabs-3).
+"'Building from Source'":http://releases.linaro.org/15.06/android/images/reference-lcr-vexpress/#tabs-3).
 
 h2. Support