resolved conflicts for merge of 594e64af to master
Change-Id: I940b7a1d409fed99a58dd79f2b9620f4c5bc3d92
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index f6d74cb..5ab3409 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -142,12 +142,12 @@
Device | Branch | Build configuration
---------|------------------|------------------------
maguro | android-4.0.3_r1 | full_maguro-userdebug
-panda | master | full_panda-eng
+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.2_r1 | full_sapphire-userdebug
-dream | android-2.2.2_r1 | full_dream-userdebug
+sapphire | android-2.2.3_r1 | full_sapphire-userdebug
+dream | android-2.2.3_r1 | full_dream-userdebug
## Flashing a device ##