merge in jb-release history after reset to master
diff --git a/src/source/build-numbers.md b/src/source/build-numbers.md
index 3c54f0c..1e782b7 100644
--- a/src/source/build-numbers.md
+++ b/src/source/build-numbers.md
@@ -41,7 +41,7 @@
Honeycomb | 3.1 | API level 12, NDK 6
Honeycomb | 3.2.x | API level 13
IceCreamSandwich | 4.0.1 - 4.0.2 | API level 14, NDK 7
-IceCreamSandwich | 4.0.3 | API level 15
+IceCreamSandwich | 4.0.3 - 4.0.4 | API level 15
Starting with Cupcake, individual builds are identified with a short
build code, e.g. FRF85B.
@@ -109,7 +109,9 @@
ITL41F | android-4.0.1_r1.2 | Galaxy Nexus
ICL53F | android-4.0.2_r1 | Galaxy Nexus
IML74K | android-4.0.3_r1 | Nexus S
-IML77 | | latest IceCreamSandwich version
+IML77 | android-4.0.3_r1.1 |
+IMM76 | android-4.0.4_r1 |
+IMM76D | android-4.0.4_r1.1 | Nexus S, latest IceCreamSandwich version
The branches froyo, gingerbread, ics-mr0, ics-mr1, represent development
branches that do not exactly match configurations that were tested
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index 5ab3409..5183b63 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -139,15 +139,15 @@
The recommended builds for the various devices are available through
the lunch menu, accessed when running the `lunch` command with no arguments:
-Device | Branch | Build configuration
----------|------------------|------------------------
-maguro | android-4.0.3_r1 | full_maguro-userdebug
-panda | master | full_panda-userdebug
-wingray | android-4.0.3_r1 | full_wingray-userdebug
-crespo | android-4.0.3_r1 | full_crespo-userdebug
-passion | android-2.3.6_r1 | full_passion-userdebug
-sapphire | android-2.2.3_r1 | full_sapphire-userdebug
-dream | android-2.2.3_r1 | full_dream-userdebug
+Device | Branch | Build configuration
+---------|--------------------|------------------------
+maguro | android-4.0.4_r1.1 | full_maguro-userdebug
+panda | master | full_panda-userdebug
+wingray | android-4.0.4_r1.1 | full_wingray-userdebug
+crespo | android-4.0.4_r1.1 | full_crespo-userdebug
+passion | android-2.3.7_r1 | full_passion-userdebug
+sapphire | android-2.2.3_r1 | full_sapphire-userdebug
+dream | android-2.2.3_r1 | full_dream-userdebug
## Flashing a device ##
@@ -199,6 +199,7 @@
2.3.5 (GRJ90) | I9020XXKA3 | I9020XXKF1 | All previous versions
2.3.6 (GRK39F) | I9020XXKA3 | I9020XXKF1 | All previous versions
4.0.3 (IML74K) | I9020XXKL1 | I9020XXKI1 | All previous versions
+4.0.4 (IMM76D) | I9020XXKL1 | I9020XXKI1
Nexus S (850MHz version "UC"):
@@ -210,6 +211,7 @@
2.3.6 (GRK39C) | I9020XXKA3 | I9020UCKF1 | All previous versions
2.3.6 (GRK39F) | I9020XXKA3 | I9020UCKF1 | All previous versions
4.0.3 (IML74K) | I9020XXKL1 | I9020UCKF1 | All previous versions
+4.0.4 (IMM76D) | I9020XXKL1 | I9020UCKJ1 | All previous versions
Nexus S (Korea version "KR"):
@@ -220,6 +222,7 @@
2.3.5 (GRJ90) | I9020XXKA3 | M200KRKC1 | All previous versions
2.3.6 (GRK39F) | I9020XXKA3 | M200KRKC1 | All previous versions
4.0.3 (IML74K) | I9020XXKL1 | M200KRKC1 | All previous versions
+4.0.4 (IMM76D) | I9020XXKL1 | M200KRKC1 | All previous versions
Galaxy Nexus (GSM/HSPA+):
@@ -228,6 +231,7 @@
4.0.1 (ITL41D) | PRIMEKJ10 | I9250XXKK1
4.0.2 (ICL53F) | PRIMEKK15 | I9250XXKK6 | All previous versions
4.0.3 (IML74K) | PRIMEKL01 | I9250XXKK6 | All previous versions
+4.0.4 (IMM76D) | PRIMEKL03 | I9250XXLA02 | Versions from 4.0.2
If you're building a new version of Android, if your Nexus S or
Galaxy Nexus has