From c7e71c8e102226afd22bd0a4ae15db6fee8e25a9 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Wed, 10 Oct 2012 15:06:08 +0200 Subject: Merge android-4.1.2_r1 Change-Id: Ie7ec98fa035d44da68f11307bb7a65d0394e008b Signed-off-by: Bernhard Rosenkraenzer --- default.xml | 112 +++++++++++++++++++++--------------------- landing-snowball.xml | 100 ++++++++++++++++++------------------- linaro-default.xml | 100 ++++++++++++++++++------------------- staging-galaxynexus.xml | 112 +++++++++++++++++++++--------------------- staging-origen.xml | 100 ++++++++++++++++++------------------- staging-panda.xml | 100 ++++++++++++++++++------------------- staging-vexpress-rtsm-isw.xml | 100 ++++++++++++++++++------------------- staging-vexpress-rtsm.xml | 100 ++++++++++++++++++------------------- staging-vexpress.xml | 100 ++++++++++++++++++------------------- tracking-origen.xml | 98 ++++++++++++++++++------------------ tracking-panda.xml | 100 ++++++++++++++++++------------------- tracking-snowball.xml | 96 ++++++++++++++++++------------------ tracking-vexpress-rtsm-mp.xml | 100 ++++++++++++++++++------------------- tracking-vexpress-tests.xml | 100 ++++++++++++++++++------------------- tracking-vexpress.xml | 100 ++++++++++++++++++------------------- 15 files changed, 759 insertions(+), 759 deletions(-) diff --git a/default.xml b/default.xml index b066aaf..379c14b 100644 --- a/default.xml +++ b/default.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -56,93 +56,93 @@ - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - - - - - - - + + + + + + + - - - + + + - - - - - - - + + + + + + + - + - - + + - + - - - - - + + + + + - + - + - + - + - - + + - + diff --git a/landing-snowball.xml b/landing-snowball.xml index ad68dfe..2fde820 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -65,93 +65,93 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - + + - - + + - + diff --git a/linaro-default.xml b/linaro-default.xml index 51f3305..8ccbfc2 100644 --- a/linaro-default.xml +++ b/linaro-default.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -64,93 +64,93 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - + + - - + + - + - + diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml index 8976080..d2ea00a 100644 --- a/staging-galaxynexus.xml +++ b/staging-galaxynexus.xml @@ -10,7 +10,7 @@ fetch="git://git.linaro.org/" /> - @@ -50,92 +50,92 @@ - + - - - - - + + + + + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - + - - + + - - - - - + + + + + - - + + - + - + - + - + - - + + - + diff --git a/staging-origen.xml b/staging-origen.xml index b99a26e..7b145fa 100644 --- a/staging-origen.xml +++ b/staging-origen.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -64,93 +64,93 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - - + + - - + + - + diff --git a/staging-panda.xml b/staging-panda.xml index b923240..18dc4b1 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -62,88 +62,88 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - + - + - - - + + + diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml index ae96426..7b87749 100644 --- a/staging-vexpress-rtsm-isw.xml +++ b/staging-vexpress-rtsm-isw.xml @@ -14,7 +14,7 @@ fetch="git://github.com/rperier/" /> - @@ -72,89 +72,89 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - + - + - - - + + + diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml index c2f209b..aff98bf 100644 --- a/staging-vexpress-rtsm.xml +++ b/staging-vexpress-rtsm.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -71,89 +71,89 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - + - + - - - + + + diff --git a/staging-vexpress.xml b/staging-vexpress.xml index 8b6c7d0..6d6ee82 100644 --- a/staging-vexpress.xml +++ b/staging-vexpress.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -64,88 +64,88 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - + - + - - - + + + diff --git a/tracking-origen.xml b/tracking-origen.xml index ee671a7..c01e513 100644 --- a/tracking-origen.xml +++ b/tracking-origen.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -62,91 +62,91 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - - + + - - + + diff --git a/tracking-panda.xml b/tracking-panda.xml index f11a11b..b4ae369 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -61,88 +61,88 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - + - + - - - + + + diff --git a/tracking-snowball.xml b/tracking-snowball.xml index 707cc1e..85f186c 100644 --- a/tracking-snowball.xml +++ b/tracking-snowball.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -64,90 +64,90 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + - - - + + + - - + + diff --git a/tracking-vexpress-rtsm-mp.xml b/tracking-vexpress-rtsm-mp.xml index ceaa4b0..f91c163 100644 --- a/tracking-vexpress-rtsm-mp.xml +++ b/tracking-vexpress-rtsm-mp.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -68,89 +68,89 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - + - + - - - + + + diff --git a/tracking-vexpress-tests.xml b/tracking-vexpress-tests.xml index 38d2507..779e171 100644 --- a/tracking-vexpress-tests.xml +++ b/tracking-vexpress-tests.xml @@ -14,7 +14,7 @@ fetch="git://github.com/rperier/" /> - @@ -69,88 +69,88 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - + - - - + + + diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml index 1c7143f..04deb5d 100644 --- a/tracking-vexpress.xml +++ b/tracking-vexpress.xml @@ -12,7 +12,7 @@ fetch="git://github.com/rperier/" /> - @@ -65,88 +65,88 @@ - + - - - - - + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - + - - - + + + -- cgit v1.2.3