resolved conflicts for merge of b09a8ced to master
Change-Id: Icb98996be3d1fb739bd04c2b43cb97f13c88c7a9
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index 443970a..f6d74cb 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -61,6 +61,7 @@
Device | Keys
---------|------
maguro | Press and hold both *Volume Up* and *Volume Down*, then press and hold *Power*
+panda | Press and hold *Input*, then press *Power*
wingray | Press and hold *Volume Down*, then press and hold *Power*
crespo | Press and hold *Volume Up*, then press and hold *Power*
passion | Press and hold the trackball, then press *Power*